Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 38 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,37 @@
<property name="nbplatform.default.harness.dir" location="${nbplatform.default.netbeans.dest.dir}/harness" />
<property name="nbantext.jar" location="netbeans/nbbuild/build/nbantext.jar" />
<property name="nb_all" location="netbeans" />
<property name="patches" value="patches/6330.diff patches/7001.diff patches/7271.diff patches/7353.diff patches/7368.diff patches/7370.diff patches/7382.diff patches/7491-preliminary.diff patches/7543.diff patches/7548.diff patches/7621.diff patches/7583.diff patches/mvn-sh.diff patches/generate-dependencies.diff patches/rename-debugger.diff patches/remove-db.diff patches/nbjavac-not-required.diff" />
<loadresource property="patch-files">
<string>
patches/6330.diff
patches/7001.diff
patches/7271.diff
patches/7353.diff
patches/7368.diff
patches/7370.diff
patches/7382.diff
patches/7491-preliminary.diff
patches/7543.diff
patches/7548.diff
patches/7621.diff
patches/7583.diff
patches/mvn-sh.diff
patches/generate-dependencies.diff
patches/rename-debugger.diff
patches/remove-db.diff
patches/nbjavac-not-required.diff
</string>
<filterchain>
<tokenfilter delimoutput=" ">
<replaceregex pattern="\s+" replace=""/>
</tokenfilter>
</filterchain>
</loadresource>
<property name="patches" value="${patch-files}"/>
<condition property="has-patches">
<length string="${patches}" trim="true" when="greater" length="0"/>
</condition>

<condition property="cmd.suffix" value=".cmd" else="">
<os family="windows"/>
</condition>
Expand Down Expand Up @@ -175,7 +205,8 @@
</exec>
</target>

<target name="apply-patches">
<target name="apply-patches" if="has-patches">
<echo>${patches}</echo>
<exec executable="git">
<arg value="apply"/>
<arg value="--directory=netbeans"/>
Expand All @@ -184,7 +215,7 @@
</exec>
</target>

<target name="unapply-patches">
<target name="unapply-patches" if="has-patches">
<!--in the reverse order:-->
<echo file="${build.dir}/Reverse.java">
import java.util.Arrays;
Expand Down Expand Up @@ -218,6 +249,10 @@
<ant dir="netbeans" inheritAll="false" inheritRefs="false" useNativeBasedir="true"/>
</target>

<target name="clean-netbeans">
<ant dir="netbeans" target="clean" inheritAll="false" inheritRefs="false" useNativeBasedir="true"/>
</target>

<target name="generate-netbeans-license-summary" depends="-set-use-jdk-javac,proxy-setup" description="Generate license summary">
<delete dir="${build.dir}/nblic" />
<mkdir dir="${build.dir}/nblic/nbcode" />
Expand Down