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 34019
Collapse All | Expand All

(-)openide/registry/build.xml (-2 / +2 lines)
Lines 56-62 Link Here
56
    <mkdir dir="netbeans/modules"/>
56
    <mkdir dir="netbeans/modules"/>
57
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
57
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
58
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
58
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
59
    <locjar jarfile="netbeans/modules/org-netbeans-modules-registry-1-${OpenIDE-Module-Specification-Version}.jar"
59
    <locjar jarfile="netbeans/modules/autoload/org-netbeans-modules-registry-1-${OpenIDE-Module-Specification-Version}.jar"
60
         manifest="manifest-subst.mf"
60
         manifest="manifest-subst.mf"
61
         basedir="src"
61
         basedir="src"
62
	 excludesfile="../../nbbuild/standard-jar-excludes.txt"
62
	 excludesfile="../../nbbuild/standard-jar-excludes.txt"
Lines 72-78 Link Here
72
  <target name="nbm" depends="netbeans" description="Build module NBM file.">
72
  <target name="nbm" depends="netbeans" description="Build module NBM file.">
73
    <makenbm file="org-netbeans-modules-registry-1-${OpenIDE-Module-Specification-Version}.nbm"
73
    <makenbm file="org-netbeans-modules-registry-1-${OpenIDE-Module-Specification-Version}.nbm"
74
             topdir="."
74
             topdir="."
75
             module="netbeans/modules/org-netbeans-modules-registry-1-${OpenIDE-Module-Specification-Version}.jar"
75
             module="netbeans/modules/autoload/org-netbeans-modules-registry-1-${OpenIDE-Module-Specification-Version}.jar"
76
	     homepage="http://openide.${homepage.base}/"
76
	     homepage="http://openide.${homepage.base}/"
77
	     distribution="http://${dist.base}/registry.nbm">
77
	     distribution="http://${dist.base}/registry.nbm">
78
      <license file="${license.file}"/>
78
      <license file="${license.file}"/>
(-)openide/registry/manifest.mf (+1 lines)
Lines 4-7 Link Here
4
OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
4
OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
5
OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
5
OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
6
OpenIDE-Module-Public-Packages: org.netbeans.api.registry.** org.netbeans.spi.registry.**
6
OpenIDE-Module-Public-Packages: org.netbeans.api.registry.** org.netbeans.spi.registry.**
7
OpenIDE-Module-Requires: org.netbeans.modules.registry.RootContextFactory
7
8
(-)openide/registry/test/build.xml (-11 / +11 lines)
Lines 169-182 Link Here
169
    	<!-- this classpath will be used for compiling tests against jars -->
169
    	<!-- this classpath will be used for compiling tests against jars -->
170
	<path id="compiletest.classpath">        
170
	<path id="compiletest.classpath">        
171
171
172
		  <fileset dir="../netbeans/modules" includes="org-netbeans-modules-registry-1-*.jar"/>
172
		  <fileset dir="../netbeans/modules/autoload" includes="org-netbeans-modules-registry-1-*.jar"/>
173
173
174
            <!-- openide -->
174
            <!-- openide -->
175
            <fileset dir="${nb_all}/openide/netbeans/lib">
175
            <fileset dir="${nb_all}/openide/netbeans/lib">
176
                <include name="openide*.jar"/>
176
                <include name="openide*.jar"/>
177
            </fileset>
177
            </fileset>
178
            <pathelement path="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
178
            <pathelement path="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
179
		  <fileset dir="${nb_all}/core/registry/netbeans/modules" includes="org-netbeans-core-registry-1-*.jar"/>
179
		  <fileset dir="${nb_all}/core/registry/netbeans/modules/autoload" includes="org-netbeans-core-registry-1-*.jar"/>
180
180
181
            <!-- junit framework -->
181
            <!-- junit framework -->
182
	    <pathelement path="${junit.path}"/>
182
	    <pathelement path="${junit.path}"/>
Lines 196-202 Link Here
196
                <include name="openide*.jar"/>
196
                <include name="openide*.jar"/>
197
            </fileset>
197
            </fileset>
198
            <pathelement path="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
198
            <pathelement path="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
199
		  <fileset dir="${nb_all}/core/registry/netbeans/modules" includes="org-netbeans-core-registry-1-*.jar"/>
199
		  <fileset dir="${nb_all}/core/registry/netbeans/modules/autoload" includes="org-netbeans-core-registry-1-*.jar"/>
200
200
201
            <!-- junit framework -->
201
            <!-- junit framework -->
202
            <pathelement path="${junit.path}"/>
202
            <pathelement path="${junit.path}"/>
Lines 209-222 Link Here
209
    	<!-- this classpath will be used for compiling tests against installed IDE -->
209
    	<!-- this classpath will be used for compiling tests against installed IDE -->
210
    	<path id="compiletest.classpath">        
210
    	<path id="compiletest.classpath">        
211
211
212
		  <fileset dir="${netbeans.home}/modules" includes="org-netbeans-modules-registry-1-*.jar"/>
212
		  <fileset dir="${netbeans.home}/modules/autoload" includes="org-netbeans-modules-registry-1-*.jar"/>
213
213
214
            <!-- openide -->
214
            <!-- openide -->
215
            <fileset dir="${netbeans.home}/lib">
215
            <fileset dir="${netbeans.home}/lib">
216
                <include name="openide*.jar"/>
216
                <include name="openide*.jar"/>
217
            </fileset>
217
            </fileset>
218
            <pathelement path="${netbeans.home}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
218
            <pathelement path="${netbeans.home}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
219
		  <fileset dir="${netbeans.home}/core/registry/netbeans/modules" includes="org-netbeans-core-registry-1-*.jar"/>
219
		  <fileset dir="${netbeans.home}/core/registry/netbeans/modules/autoload" includes="org-netbeans-core-registry-1-*.jar"/>
220
220
221
            <!-- junit framework -->
221
            <!-- junit framework -->
222
            <pathelement path="${junit.path}"/>
222
            <pathelement path="${junit.path}"/>
Lines 236-245 Link Here
236
        <!-- this classpath will be used for executing tests against jars -->
236
        <!-- this classpath will be used for executing tests against jars -->
237
    	<path id="codetest.classpath">
237
    	<path id="codetest.classpath">
238
             <pathelement location="${nb_all}/core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
238
             <pathelement location="${nb_all}/core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
239
             <fileset dir="../netbeans/modules" includes="org-netbeans-modules-registry-1-*.jar"/>
239
             <fileset dir="../netbeans/modules/autoload" includes="org-netbeans-modules-registry-1-*.jar"/>
240
	        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
240
	        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
241
	        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
241
	        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
242
		  <fileset dir="${nb_all}/core/registry/netbeans/modules" includes="org-netbeans-core-registry-1-*.jar"/>
242
		  <fileset dir="${nb_all}/core/registry/netbeans/modules/autoload" includes="org-netbeans-core-registry-1-*.jar"/>
243
	        <fileset dir="${nb_all}/core/netbeans/lib">
243
	        <fileset dir="${nb_all}/core/netbeans/lib">
244
                    <include name="core.jar"/>
244
                    <include name="core.jar"/>
245
                    <include name="ext/*.jar"/>
245
                    <include name="ext/*.jar"/>
Lines 253-262 Link Here
253
    	<path id="codetest.classpath">
253
    	<path id="codetest.classpath">
254
             <pathelement location="${nb_all}//core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
254
             <pathelement location="${nb_all}//core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
255
	        <pathelement location="../src"/>
255
	        <pathelement location="../src"/>
256
		   <fileset dir="../netbeans/modules" includes="org-netbeans-modules-registry-1-*.jar"/>
256
		   <fileset dir="../netbeans/modules/autoload" includes="org-netbeans-modules-registry-1-*.jar"/>
257
	        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
257
	        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
258
	        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
258
	        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
259
		  <fileset dir="${nb_all}/core/registry/netbeans/modules" includes="org-netbeans-core-registry-1-*.jar"/>
259
		  <fileset dir="${nb_all}/core/registry/netbeans/modules/autoload" includes="org-netbeans-core-registry-1-*.jar"/>
260
	        <fileset dir="${nb_all}/core/netbeans/lib">
260
	        <fileset dir="${nb_all}/core/netbeans/lib">
261
                    <include name="core.jar"/>
261
                    <include name="core.jar"/>
262
                    <include name="ext/*.jar"/>
262
                    <include name="ext/*.jar"/>
Lines 269-278 Link Here
269
        <!-- this classpath will be used for executing tests against installed IDE -->
269
        <!-- this classpath will be used for executing tests against installed IDE -->
270
    	<path id="codetest.classpath">
270
    	<path id="codetest.classpath">
271
          <pathelement location="../../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
271
          <pathelement location="../../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
272
          <fileset dir="../netbeans/modules" includes="org-netbeans-modules-registry-1-*.jar"/>
272
          <fileset dir="../netbeans/modules/autoload" includes="org-netbeans-modules-registry-1-*.jar"/>
273
          <pathelement location="${netbeans.home}/lib/openide.jar"/>
273
          <pathelement location="${netbeans.home}/lib/openide.jar"/>
274
          <pathelement location="${netbeans.home}/lib/openide-loaders.jar"/>
274
          <pathelement location="${netbeans.home}/lib/openide-loaders.jar"/>
275
          <fileset dir="${netbeans.home}/core/registry/netbeans/modules" includes="org-netbeans-core-registry-1-*.jar"/>
275
          <fileset dir="${netbeans.home}/core/registry/netbeans/modules/autoload" includes="org-netbeans-core-registry-1-*.jar"/>
276
          <fileset dir="${netbeans.home}/lib">
276
          <fileset dir="${netbeans.home}/lib">
277
                    <include name="core.jar"/>
277
                    <include name="core.jar"/>
278
                    <include name="ext/*.jar"/>
278
                    <include name="ext/*.jar"/>
(-)core/registry/build.xml (-3 / +3 lines)
Lines 43-49 Link Here
43
      <classpath>
43
      <classpath>
44
        <pathelement location="../../openide/openide-13javac-workaround.jar"/>
44
        <pathelement location="../../openide/openide-13javac-workaround.jar"/>
45
        <pathelement location="../../openide/netbeans/lib/openide.jar"/>
45
        <pathelement location="../../openide/netbeans/lib/openide.jar"/>
46
        <fileset dir="../../openide/registry/netbeans/modules" includes="org-netbeans-modules-registry-1-*.jar"/>
46
        <fileset dir="../../openide/registry/netbeans/modules/autoload" includes="org-netbeans-modules-registry-1-*.jar"/>
47
        <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
47
        <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
48
        <pathelement location="../netbeans/lib/core.jar"/>
48
        <pathelement location="../netbeans/lib/core.jar"/>
49
        <fileset dir="../external">
49
        <fileset dir="../external">
Lines 58-64 Link Here
58
    <mkdir dir="netbeans/modules"/>
58
    <mkdir dir="netbeans/modules"/>
59
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
59
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
60
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
60
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
61
    <locjar jarfile="netbeans/modules/org-netbeans-core-registry-1-${OpenIDE-Module-Specification-Version}.jar"
61
    <locjar jarfile="netbeans/modules/autoload/org-netbeans-core-registry-1-${OpenIDE-Module-Specification-Version}.jar"
62
         manifest="manifest-subst.mf"
62
         manifest="manifest-subst.mf"
63
         basedir="src"
63
         basedir="src"
64
	 excludesfile="../../nbbuild/standard-jar-excludes.txt"
64
	 excludesfile="../../nbbuild/standard-jar-excludes.txt"
Lines 74-80 Link Here
74
  <target name="nbm" depends="netbeans" description="Build module NBM file.">
74
  <target name="nbm" depends="netbeans" description="Build module NBM file.">
75
    <makenbm file="org-netbeans-core-registry-1-${OpenIDE-Module-Specification-Version}.nbm"
75
    <makenbm file="org-netbeans-core-registry-1-${OpenIDE-Module-Specification-Version}.nbm"
76
             topdir="."
76
             topdir="."
77
             module="netbeans/modules/org-netbeans-core-registry-1-${OpenIDE-Module-Specification-Version}.jar"
77
             module="netbeans/modules/autoload/org-netbeans-core-registry-1-${OpenIDE-Module-Specification-Version}.jar"
78
	     homepage="http://core.${homepage.base}/"
78
	     homepage="http://core.${homepage.base}/"
79
	     distribution="http://${dist.base}/registry-core.nbm">
79
	     distribution="http://${dist.base}/registry-core.nbm">
80
      <license file="${license.file}"/>
80
      <license file="${license.file}"/>
(-)core/registry/manifest.mf (+1 lines)
Lines 5-8 Link Here
5
OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
5
OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
6
OpenIDE-Module-Public-Packages: -
6
OpenIDE-Module-Public-Packages: -
7
OpenIDE-Module-Module-Dependencies: org.netbeans.modules.registry/1 = @BUILD_NUMBER_SUBST@, org.netbeans.core/1 > 1.15
7
OpenIDE-Module-Module-Dependencies: org.netbeans.modules.registry/1 = @BUILD_NUMBER_SUBST@, org.netbeans.core/1 > 1.15
8
OpenIDE-Module-Provides: org.netbeans.modules.registry.RootContextFactory
8
9

Return to bug 34019