jlahoda closed pull request #3: Supporting building from the source bundle.
URL: https://github.com/apache/incubator-netbeans-jackpot30/pull/3
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/cmdline/ant/build.xml b/cmdline/ant/build.xml
index 21055f3..8835f54 100644
--- a/cmdline/ant/build.xml
+++ b/cmdline/ant/build.xml
@@ -89,8 +89,8 @@
     -->
     <target name="-post-compile">
         <mkdir dir="META-INF" />
-        <copy file="../../LICENSE" todir="${build.classes.dir}/META-INF" />
-        <copy file="../../NOTICE" todir="${build.classes.dir}/META-INF" />
-        <copy file="../../DISCLAIMER" todir="${build.classes.dir}/META-INF" />
+        <copy file="${jackpot.root}/LICENSE" 
todir="${build.classes.dir}/META-INF" />
+        <copy file="${jackpot.root}/NOTICE" 
todir="${build.classes.dir}/META-INF" />
+        <copy file="${jackpot.root}/DISCLAIMER" 
todir="${build.classes.dir}/META-INF" />
     </target>
 </project>
diff --git a/cmdline/build.xml b/cmdline/build.xml
index e62563e..ec36182 100644
--- a/cmdline/build.xml
+++ b/cmdline/build.xml
@@ -36,19 +36,23 @@
     <target name="build-source-dist">
         <mkdir dir="build" />
         <zip file="build/incubating-apache-netbeans-jackpot-${version}.zip">
-            <zipfileset dir="." />
-            <zipfileset dir=".." includes="DISCLAIMER" fullpath="DISCLAIMER"/>
-            <zipfileset dir=".." includes="LICENSE" fullpath="LICENSE"/>
-            <zipfileset dir=".." includes="NOTICE" fullpath="NOTICE"/>
+            <zipfileset dir="." excludes="**/build/" prefix="jackpot"/>
+            <zipfileset dir=".." includes="DISCLAIMER" 
fullpath="jackpot/DISCLAIMER"/>
+            <zipfileset dir=".." includes="LICENSE" 
fullpath="jackpot/LICENSE"/>
+            <zipfileset dir=".." includes="NOTICE" fullpath="jackpot/NOTICE"/>
         </zip>
     </target>
 
     <target name="build-and-test">
+        <condition property="jackpot.root" value="${basedir}" 
else="${basedir}/..">
+            <available file="${basedir}/LICENSE" />
+        </condition>
         <ant dir="${basedir}" inheritAll="false" inheritRefs="false">
             <property name="nbplatform.default.harness.dir" 
value="${NETBEANS_PLATFORM}/harness" />
             <property name="nbplatform.default.netbeans.dest.dir" 
value="${NETBEANS_PLATFORM}" />
             <property name="test.run.args" 
value="--add-exports=jdk.javadoc/com.sun.tools.javadoc.main=ALL-UNNAMED" />
             <property name="test.nbjdk.home" value="${JDK10}" />
+            <property name="jackpot.root" location="${jackpot.root}" />
             <target name="clean" />
             <target name="build" />
             <target name="test" />
@@ -59,6 +63,7 @@
             <property name="continue.after.failing.tests" value="false" />
             <property name="test.run.args" 
value="--add-exports=jdk.javadoc/com.sun.tools.javadoc.main=ALL-UNNAMED" />
             <property name="test.nbjdk.home" value="${JDK10}" />
+            <property name="jackpot.root" location="${jackpot.root}" />
         </ant>
         <property environment="env"/>
         <exec executable="build/test/scripted/run" dir="tool" 
failonerror="true">
diff --git a/cmdline/tool/build.xml b/cmdline/tool/build.xml
index 58be5ca..f85a9bb 100644
--- a/cmdline/tool/build.xml
+++ b/cmdline/tool/build.xml
@@ -44,7 +44,7 @@
         <jar update="true" 
destfile="${build.classes.dir}/../jackpot/jackpot.jar">
             <zipfileset dir="scripts" includes="LICENSE-bin-tool.txt" 
fullpath="META-INF/LICENSE" />
             <zipfileset dir="scripts" includes="NOTICE-bin-tool.txt" 
fullpath="META-INF/NOTICE" />
-            <zipfileset dir="../.." includes="DISCLAIMER" 
fullpath="META-INF/DISCLAIMER" />
+            <zipfileset dir="${jackpot.root}" includes="DISCLAIMER" 
fullpath="META-INF/DISCLAIMER" />
         </jar>
         <ant target="jar" inheritall="false" inheritrefs="false" dir="../ant">
             <property name="var.nbplatform.default.netbeans.dest.dir" 
location="${nbplatform.default.netbeans.dest.dir}" />
@@ -53,7 +53,7 @@
         <copy file="../ant/dist/jackpot-ant.jar" 
todir="${build.classes.dir}/../jackpot"/>
         <copy file="scripts/LICENSE-bin-tool.txt" 
tofile="${build.classes.dir}/../jackpot/LICENSE" />
         <copy file="scripts/NOTICE-bin-tool.txt" 
tofile="${build.classes.dir}/../jackpot/NOTICE" />
-        <copy file="../../DISCLAIMER" 
tofile="${build.classes.dir}/../jackpot/DISCLAIMER" />
+        <copy file="${jackpot.root}/DISCLAIMER" 
tofile="${build.classes.dir}/../jackpot/DISCLAIMER" />
         <copy file="../README.md" 
tofile="${build.classes.dir}/../jackpot/README.md" />
         <zip destfile="${build.classes.dir}/../jackpot.zip">
             <zipfileset file="${build.classes.dir}/../jackpot/jackpot" 
filemode="755" fullpath="jackpot/jackpot"/>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[email protected]


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to