This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new f0e591d [NetBeans-259] Consolidate README in Apache NetBeans src
distros (#359)
f0e591d is described below
commit f0e591d135d304d47ccdb7a41e46aba16e4fc21d
Author: Geertjan Wielenga <[email protected]>
AuthorDate: Wed Jan 10 16:29:36 2018 +0100
[NetBeans-259] Consolidate README in Apache NetBeans src distros (#359)
* Updating shortcuts document to 9.0.
* Revert "Updating shortcuts document to 9.0."
This reverts commit adc15f559952f1a5259d6f27a628b964eb0fed2b.
* Removing this file, which is now generated automatically as DEPENDENCIES
file.
* [NETBEANS-259] Consolidate README in Apache NetBeans src distros
---
ide.branding/README-src.txt | 3 ---
nbbuild/build.xml | 7 +++----
o.n.bootstrap/readme/README-src.txt | 3 ---
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/ide.branding/README-src.txt b/ide.branding/README-src.txt
deleted file mode 100644
index 1f7a9b0..0000000
--- 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 722be15..e77a266 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 96573da..0000000
--- 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.
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
---------------------------------------------------------------------
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
