[GitHub] geertjanw closed pull request #359: [NetBeans-259] Consolidate README in Apache NetBeans src distros

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

geertjanw closed pull request #359: [NetBeans-259] Consolidate README in Apache NetBeans src distros
URL: https://github.com/apache/incubator-netbeans/pull/359
 
 
   

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/ide.branding/README-src.txt b/ide.branding/README-src.txt
deleted file mode 100644
index 1f7a9b045..000000000
--- a/ide.branding/README-src.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a NetBeans IDE source zip.
-
-To build the NetBeans IDE, run "ant". The IDE will be into nbbuild/netbeans.
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 722be1524..e77a2667c 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1605,8 +1605,8 @@ 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/README-src.txt">
+    <condition property="source.zip.readme" else="${nb_all}/README.md"
+                                            value="${nb_all}/README.md">
         <isset property="has.nb.cluster" />
     </condition>
     <zip zipfile="${nb.build.dir}/${cluster.config}-src-${buildnum}.zip" duplicate="preserve">
@@ -1623,7 +1623,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" />
+      <zipfileset file="${source.zip.readme}" fullpath="README.md" erroronmissingarchive="false" />
     </zip>
   </target>
 
@@ -2138,7 +2138,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
             <exclude name="html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/*/catalog" /> <!--no degree of creativity-->
             <exclude name="hudson.subversion/test/unit/src/org/netbeans/modules/hudson/subversion/sample-entries-file" /> <!--test data-->
             <exclude name="ide/launcher/macosx/NetBeansLauncher/ReadMe.rtf" /> <!--does not natively support comments-->
-            <exclude name="ide.branding/README-src.txt" /> <!--README-->
             <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/*.xsd" /> <!-- XSDs for usage at runtime and code generation - the XSDs are not modified, so covered by https://www.apache.org/legal/resolved.html#category-b -->
             <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/*.xml" /> <!-- user visible file template -->
             <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/*.txt" /> <!-- user visible file template -->
diff --git a/o.n.bootstrap/readme/README-src.txt b/o.n.bootstrap/readme/README-src.txt
deleted file mode 100644
index 96573dadf..000000000
--- a/o.n.bootstrap/readme/README-src.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-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

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

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