Lines 23-29
Link Here
|
23 |
<property name="binroot" location="../../nbextra"/> |
23 |
<property name="binroot" location="../../nbextra"/> |
24 |
<property name="homepage.base" value="netbeans.org"/> |
24 |
<property name="homepage.base" value="netbeans.org"/> |
25 |
<property name="dist.base" value="www.netbeans.org/download/nbms/40"/> |
25 |
<property name="dist.base" value="www.netbeans.org/download/nbms/40"/> |
26 |
<property name="license.file" location="org-openide-nbm-license.txt"/> |
26 |
<property name="license.file" location="../nbbuild/standard-nbm-license.txt"/> |
27 |
|
27 |
|
28 |
<property name="nbm_alias" value="nb_ide"/> |
28 |
<property name="nbm_alias" value="nb_ide"/> |
29 |
|
29 |
|
Lines 191-196
Link Here
|
191 |
<target name="jars" depends="compile,13javac-workaround,vers-prep" description="Create JAR files."> |
191 |
<target name="jars" depends="compile,13javac-workaround,vers-prep" description="Create JAR files."> |
192 |
<mkdir dir="netbeans/lib"/> |
192 |
<mkdir dir="netbeans/lib"/> |
193 |
<filter token="Class-Path" value="Class-Path"/> |
193 |
<filter token="Class-Path" value="Class-Path"/> |
|
|
194 |
<filter token="OpenIDE-Module" value="OpenIDE-Module"/> |
194 |
<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/> |
195 |
<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/> |
195 |
<locjar jarfile="netbeans/lib/openide.jar" |
196 |
<locjar jarfile="netbeans/lib/openide.jar" |
196 |
manifest="manifest-subst.mf" |
197 |
manifest="manifest-subst.mf" |
Lines 220-225
Link Here
|
220 |
<mkdir dir="netbeans/lib/patches"/> |
221 |
<mkdir dir="netbeans/lib/patches"/> |
221 |
<!-- Use the same manifest to ensure that packages are defined correctly. --> |
222 |
<!-- Use the same manifest to ensure that packages are defined correctly. --> |
222 |
<filter token="Class-Path" value="X-Commented-Out-Class-Path"/> |
223 |
<filter token="Class-Path" value="X-Commented-Out-Class-Path"/> |
|
|
224 |
<filter token="OpenIDE-Module" value="X-Commented-Out-OpenIDE-Module"/> |
223 |
<copy file="manifest.mf" tofile="manifest-compat-subst.mf" filtering="on"/> |
225 |
<copy file="manifest.mf" tofile="manifest-compat-subst.mf" filtering="on"/> |
224 |
<jar jarfile="netbeans/lib/patches/openide-compat.jar" |
226 |
<jar jarfile="netbeans/lib/patches/openide-compat.jar" |
225 |
basedir="compatkit-work" |
227 |
basedir="compatkit-work" |
Lines 231-236
Link Here
|
231 |
<target name="jars-with-lib" depends="libs,compile,13javac-workaround,vers-prep" description="Create JAR files."> |
233 |
<target name="jars-with-lib" depends="libs,compile,13javac-workaround,vers-prep" description="Create JAR files."> |
232 |
<mkdir dir="standalone"/> |
234 |
<mkdir dir="standalone"/> |
233 |
<filter token="Class-Path" value="Class-Path"/> |
235 |
<filter token="Class-Path" value="Class-Path"/> |
|
|
236 |
<filter token="OpenIDE-Module" value="OpenIDE-Module"/> |
234 |
<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/> |
237 |
<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/> |
235 |
<locjar jarfile="standalone/openide-remainder.jar" |
238 |
<locjar jarfile="standalone/openide-remainder.jar" |
236 |
manifest="manifest-subst.mf" |
239 |
manifest="manifest-subst.mf" |
Lines 310-316
Link Here
|
310 |
--> |
313 |
--> |
311 |
</target> |
314 |
</target> |
312 |
|
315 |
|
313 |
<target name="netbeans" depends="jars" description="Build everything needed for inclusion in the IDE."/> |
316 |
<target name="netbeans" depends="fake" description="Build everything needed for inclusion in the IDE."> |
|
|
317 |
<genlist targetname="nbm" outputfiledir="../nbbuild/netbeans"/> |
318 |
</target> |
314 |
|
319 |
|
315 |
|
320 |
|
316 |
<!-- Build separate libraries for the IDE --> |
321 |
<!-- Build separate libraries for the IDE --> |
Lines 838-843
Link Here
|
838 |
<delete dir="compatkit-work"/> |
843 |
<delete dir="compatkit-work"/> |
839 |
<delete dir="standalone"/> |
844 |
<delete dir="standalone"/> |
840 |
<delete dir="fake" /> |
845 |
<delete dir="fake" /> |
|
|
846 |
<delete file="openide-core.nbm"/> |
841 |
</target> |
847 |
</target> |
842 |
<target name="real-clean" depends="clean" description="As for clean, but also remove example module reload area."> |
848 |
<target name="real-clean" depends="clean" description="As for clean, but also remove example module reload area."> |
843 |
<delete dir="examplemodulereload"/> |
849 |
<delete dir="examplemodulereload"/> |
Lines 897-916
Link Here
|
897 |
|
903 |
|
898 |
<!-- creating a fake module for distribution of openide & core as nbm --> |
904 |
<!-- creating a fake module for distribution of openide & core as nbm --> |
899 |
|
905 |
|
900 |
<target name="nbm" depends="netbeans, preparenbm"> |
906 |
<target name="nbm" depends="netbeans"> |
901 |
<makenbm file="org-openide.nbm" |
907 |
<makenbm file="openide-core.nbm" |
902 |
topdir="fake" |
908 |
topdir="fake" |
903 |
module="fake/netbeans/modules/org-openide.jar" |
909 |
module="fake/netbeans/lib/openide.jar" |
904 |
homepage="http://openide.${homepage.base}/" |
910 |
homepage="http://openide.${homepage.base}/" |
905 |
distribution="http://${dist.base}/org-openide.nbm"> |
911 |
distribution="http://${dist.base}/openide-core.nbm"> |
906 |
<license file="${license.file}"/> |
912 |
<license name="org-openide-license.txt"> |
|
|
913 |
<text>For the NetBeans API and core code:</text> |
914 |
<file location="${license.file}"/> |
915 |
<text>For the Crimson, Regexp, XML Commons, and Xerces software products |
916 |
included with the NetBeans core:</text> |
917 |
<file location="apache-license.txt"/> |
918 |
</license> |
907 |
<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/> |
919 |
<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/> |
908 |
</makenbm> |
920 |
</makenbm> |
909 |
</target> |
921 |
</target> |
910 |
|
922 |
|
911 |
<target name="preparenbm" depends="vers-prep" > |
923 |
<target name="fake" depends="jars" > |
912 |
<!-- our fake directory, where we are going to copy all modules --> |
924 |
<!-- our fake directory, where we are going to copy all modules --> |
913 |
<mkdir dir="fake" /> |
925 |
<mkdir dir="fake/netbeans" /> |
914 |
<copy todir="fake/netbeans"> |
926 |
<copy todir="fake/netbeans"> |
915 |
<fileset dir="netbeans" /> |
927 |
<fileset dir="netbeans" /> |
916 |
</copy> |
928 |
</copy> |
Lines 920-925
Link Here
|
920 |
<antcall target="buildandcopy"> |
932 |
<antcall target="buildandcopy"> |
921 |
<param name="dir" value="../core" /> |
933 |
<param name="dir" value="../core" /> |
922 |
</antcall> |
934 |
</antcall> |
|
|
935 |
<!-- XXX delete when these are real modules: phrebejk's job --> |
923 |
<antcall target="buildandcopy"> |
936 |
<antcall target="buildandcopy"> |
924 |
<param name="dir" value="../core/compiler" /> |
937 |
<param name="dir" value="../core/compiler" /> |
925 |
</antcall> |
938 |
</antcall> |
Lines 935-955
Link Here
|
935 |
<antcall target="buildandcopy"> |
948 |
<antcall target="buildandcopy"> |
936 |
<param name="dir" value="../core/ide" /> |
949 |
<param name="dir" value="../core/ide" /> |
937 |
</antcall> |
950 |
</antcall> |
938 |
|
|
|
939 |
<copy file="org-openide.mf" tofile="org-openide-subst.mf" filtering="on"/> |
940 |
|
941 |
<locjar jarfile="fake/netbeans/modules/org-openide.jar" |
942 |
manifest="org-openide-subst.mf" |
943 |
compress="false"> |
944 |
<locale name="ja"/> |
945 |
|
946 |
<!-- Include just the Bundle.properties describing the module --> |
947 |
<fileset dir="." excludesfile="../nbbuild/standard-jar-excludes.txt" > |
948 |
<include name="org-openide.properties" /> |
949 |
</fileset> |
950 |
</locjar> |
951 |
|
952 |
<genlist targetname="nbm" outputfiledir="../nbbuild/netbeans"/> |
953 |
</target> |
951 |
</target> |
954 |
|
952 |
|
955 |
<target name="buildandcopy" > |
953 |
<target name="buildandcopy" > |