[GitHub] geertjanw closed pull request #267: [NETBEANS-129] Adding infrastructure to include README in platform source and binary zip.

[GitBox <gi...@apache.org>]

geertjanw closed pull request #267: [NETBEANS-129] Adding infrastructure to include README in platform source and binary zip.
URL: https://github.com/apache/incubator-netbeans/pull/267
 
 
   

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/nbbuild/build.xml b/nbbuild/build.xml
index 0b55f9489..4af0e1ec2 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -295,6 +295,7 @@
        </condition>
   </target>
   <target name="finish-build-platform" depends="init,-check-nb-cluster" unless="has.nb.cluster">
+    <copy file="../o.n.bootstrap/readme/README-bin.txt" tofile="${netbeans.dest.dir}/README.txt" overwrite="true"/>
     <fixcrlf eol="lf" srcdir="${netbeans.dest.dir}" >
       <include name="${nb.cluster.platform.dir}/lib/nbexec" />
     </fixcrlf>
@@ -1505,8 +1506,11 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
         <copy file="${nb_all}/DISCLAIMER" tofile="${netbeans.dest.dir}/DISCLAIMER" />
     </target>
 
+    <target name="-copy-platform-readme" depends="-check-nb-cluster" unless="has.nb.cluster">
+    </target>
+
   <target name="build-source-config"
-    depends="init,set-buildnumber"
+    depends="init,set-buildnumber,-check-nb-cluster"
     description="Packages sources needed to compile one cluster.config">
     <property name="buildnum" value="${buildnumber}"/>
     <echo message="Packaging sources of ${cluster.config} modules"/>
@@ -1552,6 +1556,9 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
             </tokenfilter>
         </filterchain>
     </concat>
+    <condition property="source.zip.readme" else="${nb_all}/o.n.bootstrap/readme/README-src.txt" value="${nb_all}/ide.branding/does-not-exist-yet">
+        <isset property="has.nb.cluster" />
+    </condition>
     <zip zipfile="${nb.build.dir}/${cluster.config}-src-${buildnum}.zip" duplicate="preserve">
       <zipfileset dir="${nb_all}" includes="${source.dirs}">
           <exclude name="*/build/**/*"/>
@@ -1566,6 +1573,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
       <zipfileset file="${nb.build.dir}/NOTICE" />
       <zipfileset file="${nb.build.dir}/LICENSE" />
       <zipfileset file="${nb_all}/DISCLAIMER" />
+      <zipfileset file="${source.zip.readme}" fullpath="README.txt" erroronmissingarchive="false" />
     </zip>
   </target>
 
diff --git a/o.n.bootstrap/readme/README-bin.txt b/o.n.bootstrap/readme/README-bin.txt
new file mode 100644
index 000000000..7a9676a72
--- /dev/null
+++ b/o.n.bootstrap/readme/README-bin.txt
@@ -0,0 +1,7 @@
+This is a NetBeans Plaform binary build.
+
+JavaHelp note: JavaHelp is not distributed in this build.
+If your application needs it, you may need to supply it
+using -Djhall.jar=<path-to-jsearch.jar from the JavaHelp
+distribution>. At runtime, you may need to supply it using
+--cp:a <path-to-jhall.jar>
diff --git a/o.n.bootstrap/readme/README-src.txt b/o.n.bootstrap/readme/README-src.txt
new file mode 100644
index 000000000..96573dadf
--- /dev/null
+++ b/o.n.bootstrap/readme/README-src.txt
@@ -0,0 +1,3 @@
+This is a NetBeans Platform source zip.
+
+To build the NetBeans Platform, run "ant". The built platform will be in nbbuild/netbeans.


 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services