Attachment #21844 for bug #58258

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 58258
Collapse All | Expand All




        <copy file="release/lib/ide.ks" todir="${netbeans.dest.dir}/${cluster.dir}/core"/>
    </target>

  <target name="clean-modules" description="Moves the moved classes back">
    <move todir="src">
      <fileset dir="bootstrap/src">
        <include name="org/netbeans/core/modules/ChangeFirer.java"/>
        <include name="org/netbeans/core/modules/DuplicateException.java"/>
        <include name="org/netbeans/core/modules/Events.java"/>
        <include name="org/netbeans/core/modules/InvalidException.java"/>
        <include name="org/netbeans/core/modules/JarClassLoader.java"/>
        <include name="org/netbeans/core/modules/Module.java"/>
        <include name="org/netbeans/core/modules/ModuleInstaller.java"/>
        <include name="org/netbeans/core/modules/ModuleManager.java"/>
        <include name="org/netbeans/core/modules/ProxyClassLoader.java"/>
        <include name="org/netbeans/core/modules/Util.java"/>
      </fileset>
    </move>
  </target>
  <target name="lib-modules" description="Moves independent modules API to core/bootstrap">
    <move todir="bootstrap/src">
      <fileset dir="src">
        <include name="org/netbeans/core/modules/ChangeFirer.java"/>
        <include name="org/netbeans/core/modules/DuplicateException.java"/>
        <include name="org/netbeans/core/modules/Events.java"/>
        <include name="org/netbeans/core/modules/InvalidException.java"/>
        <include name="org/netbeans/core/modules/JarClassLoader.java"/>
        <include name="org/netbeans/core/modules/ManifestSection.java"/>
        <include name="org/netbeans/core/modules/Module.java"/>
        <include name="org/netbeans/core/modules/ModuleInstaller.java"/>
        <include name="org/netbeans/core/modules/ModuleManager.java"/>
        <include name="org/netbeans/core/modules/ProxyClassLoader.java"/>
        <include name="org/netbeans/core/modules/Util.java"/>
      </fileset>
    </move>
    <ant dir="../openide" target="lib-util"/>
    <javac srcdir="modules-lib/src" destdir="modules-lib/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
      <exclude name="org/netbeans/core/modules/ManifestSection.java"/>
      <classpath>
        <pathelement location="../openide/netbeans/lib/openide-util.jar"/>
      </classpath>
    </javac>
    <ant dir="../openide" target="jars"/>
    <javac srcdir="modules-lib/src" destdir="modules-lib/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
      <include name="org/netbeans/core/modules/ManifestSection.java"/>
      <classpath>
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
      </classpath>
    </javac>
    <tstamp>
      <format property="buildnumber-default" pattern="yyyyMMddHHmm"/>
    </tstamp>
    <property name="buildnumber" value="${buildnumber-default}"/>
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
    <copy file="manifest-modules.mf" tofile="modules-lib/manifest-modules-subst.mf" filtering="on"/>
    <jar jarfile="modules-lib/modules.jar" manifest="modules-lib/manifest-modules-subst.mf">
      <fileset dir="modules-lib/src">
        <exclude name="**/*.java"/>
        <exclude name="org/netbeans/core/modules/ManifestSection$*Section*.class"/>
      </fileset>
    </jar>
  </target>
-->

</project>

Lines 14-19 Microsystems, Inc. All Rights Reserved. Link Here

(-)core/bootstrap/build.xml (+7 lines)
14	<project name="core/bootstrap" default="netbeans" basedir=".">	14	<project name="core/bootstrap" default="netbeans" basedir=".">
15		15
16	<import file="../../nbbuild/templates/projectized.xml"/>	16	<import file="../../nbbuild/templates/projectized.xml"/>
		17
		18	<target name="init" depends="projectized.init" >
		19	<ant dir=".." target="lib-modules" />
		20	</target>
		21	<target name="clean" depends="projectized.clean" >
		22	<ant dir=".." target="clean-modules" />
		23	</target>
17		24
18	<target name="netbeans-extra" depends="release"/>	25	<target name="netbeans-extra" depends="release"/>
19		26




            <path>core/bootstrap</path>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>6.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.modules</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>6.0</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>

Return to bug 58258

Lines 22-78 Microsystems, Inc. All Rights Reserved. Link Here

(-)core/build.xml (-38 / +18 lines)
22	<copy file="release/lib/ide.ks" todir="${netbeans.dest.dir}/${cluster.dir}/core"/>	22	<copy file="release/lib/ide.ks" todir="${netbeans.dest.dir}/${cluster.dir}/core"/>
23	</target>	23	</target>
24		24
25	<!-- XXX may be obsolete:	25	<target name="clean-modules" description="Moves the moved classes back">
26	<target name="lib-modules" description="Create a standalone Modules API and implementation." depends="init">	26	<move todir="src">
27	<mkdir dir="modules-lib/src"/>	27	<fileset dir="bootstrap/src">
28	<copy todir="modules-lib/src">	28	<include name="org/netbeans/core/modules/ChangeFirer.java"/>
29	<fileset dir="../openide/src">	29	<include name="org/netbeans/core/modules/DuplicateException.java"/>
30	<include name="org/openide/modules/SpecificationVersion.java"/>	30	<include name="org/netbeans/core/modules/Events.java"/>
31	<include name="org/openide/modules/ModuleInfo.java"/>	31	<include name="org/netbeans/core/modules/InvalidException.java"/>
32	<include name="org/openide/modules/ModuleInstall.java"/>	32	<include name="org/netbeans/core/modules/JarClassLoader.java"/>
33	<include name="org/openide/modules/Dependency.java"/>	33	<include name="org/netbeans/core/modules/Module.java"/>
		34	<include name="org/netbeans/core/modules/ModuleInstaller.java"/>
		35	<include name="org/netbeans/core/modules/ModuleManager.java"/>
		36	<include name="org/netbeans/core/modules/ProxyClassLoader.java"/>
		37	<include name="org/netbeans/core/modules/Util.java"/>
34	</fileset>	38	</fileset>
		39	</move>
		40	</target>
		41	<target name="lib-modules" description="Moves independent modules API to core/bootstrap">
		42	<move todir="bootstrap/src">
35	<fileset dir="src">	43	<fileset dir="src">
36	<include name="org/netbeans/core/modules/ChangeFirer.java"/>	44	<include name="org/netbeans/core/modules/ChangeFirer.java"/>
37	<include name="org/netbeans/core/modules/DuplicateException.java"/>	45	<include name="org/netbeans/core/modules/DuplicateException.java"/>
38	<include name="org/netbeans/core/modules/Events.java"/>	46	<include name="org/netbeans/core/modules/Events.java"/>
39	<include name="org/netbeans/core/modules/InvalidException.java"/>	47	<include name="org/netbeans/core/modules/InvalidException.java"/>
40	<include name="org/netbeans/core/modules/JarClassLoader.java"/>	48	<include name="org/netbeans/core/modules/JarClassLoader.java"/>
41	<include name="org/netbeans/core/modules/ManifestSection.java"/>
42	<include name="org/netbeans/core/modules/Module.java"/>	49	<include name="org/netbeans/core/modules/Module.java"/>
43	<include name="org/netbeans/core/modules/ModuleInstaller.java"/>	50	<include name="org/netbeans/core/modules/ModuleInstaller.java"/>
44	<include name="org/netbeans/core/modules/ModuleManager.java"/>	51	<include name="org/netbeans/core/modules/ModuleManager.java"/>
45	<include name="org/netbeans/core/modules/ProxyClassLoader.java"/>	52	<include name="org/netbeans/core/modules/ProxyClassLoader.java"/>
46	<include name="org/netbeans/core/modules/Util.java"/>	53	<include name="org/netbeans/core/modules/Util.java"/>
47	</fileset>	54	</fileset>
48	</copy>	55	</move>
49	<ant dir="../openide" target="lib-util"/>
50	<javac srcdir="modules-lib/src" destdir="modules-lib/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
51	<exclude name="org/netbeans/core/modules/ManifestSection.java"/>
52	<classpath>
53	<pathelement location="../openide/netbeans/lib/openide-util.jar"/>
54	</classpath>
55	</javac>
56	<ant dir="../openide" target="jars"/>
57	<javac srcdir="modules-lib/src" destdir="modules-lib/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
58	<include name="org/netbeans/core/modules/ManifestSection.java"/>
59	<classpath>
60	<pathelement location="../openide/netbeans/lib/openide.jar"/>
61	</classpath>
62	</javac>
63	<tstamp>
64	<format property="buildnumber-default" pattern="yyyyMMddHHmm"/>
65	</tstamp>
66	<property name="buildnumber" value="${buildnumber-default}"/>
67	<filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
68	<copy file="manifest-modules.mf" tofile="modules-lib/manifest-modules-subst.mf" filtering="on"/>
69	<jar jarfile="modules-lib/modules.jar" manifest="modules-lib/manifest-modules-subst.mf">
70	<fileset dir="modules-lib/src">
71	<exclude name="*/.java"/>
72	<exclude name="org/netbeans/core/modules/ManifestSection$Section.class"/>
73	</fileset>
74	</jar>
75	</target>	56	</target>
76	-->
77		57
78	</project>	58	</project>

Lines 19-30 Microsystems, Inc. All Rights Reserved. Link Here

(-)core/bootstrap/nbproject/project.xml (-2 / +11 lines)
19	<path>core/bootstrap</path>	19	<path>core/bootstrap</path>
20	<module-dependencies>	20	<module-dependencies>
21	<dependency>	21	<dependency>
22	<code-name-base>org.openide</code-name-base>	22	<code-name-base>org.openide.util</code-name-base>
23	<build-prerequisite/>	23	<build-prerequisite/>
24	<compile-dependency/>	24	<compile-dependency/>
25	<run-dependency>	25	<run-dependency>
26	<release-version>1</release-version>	26	<release-version>1</release-version>
27	<specification-version>5.0</specification-version>	27	<specification-version>6.0</specification-version>
		28	</run-dependency>
		29	</dependency>
		30	<dependency>
		31	<code-name-base>org.openide.modules</code-name-base>
		32	<build-prerequisite/>
		33	<compile-dependency/>
		34	<run-dependency>
		35	<release-version>1</release-version>
		36	<specification-version>6.0</specification-version>
28	</run-dependency>	37	</run-dependency>
29	</dependency>	38	</dependency>
30	</module-dependencies>	39	</module-dependencies>