Commits

Anonymous committed 277f5d3

Headless build support

  • Participants
  • Parent commits dfe2418

Comments (0)

Files changed (4)

File nbproject/platform.properties

 cluster.path=\
-    ${nbplatform.active.dir}/nb:\
     ${nbplatform.active.dir}/enterprise:\
+    ${nbplatform.active.dir}/harness:\
     ${nbplatform.active.dir}/ide:\
     ${nbplatform.active.dir}/java:\
-    ${nbplatform.active.dir}/dlight:\
-    ${nbplatform.active.dir}/websvccommon:\
-    ${nbplatform.active.dir}/apisupport:\
+    ${nbplatform.active.dir}/nb:\
+    ${nbplatform.active.dir}/platform:\
     ${nbplatform.active.dir}/profiler:\
-    ${nbplatform.active.dir}/platform:\
-    ${nbplatform.active.dir}/cnd:\
-    ${nbplatform.active.dir}/harness
+    ${nbplatform.active.dir}/websvccommon
+nbjdk.active=default
 nbplatform.active=default
+suite.dir=${basedir}
+nbplatform.default.netbeans.dest.dir=${suite.dir}/tmp/netbeans
+nbplatform.default.harness.dir=${suite.dir}/tmp/netbeans/harness
+bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
+netbeans.updatecenter.url=http://updates.netbeans.org/netbeans/updates/7.1/uc/final/distribution/catalog.xml.gz
+contrib.updatecenter.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/nbms/updates.xml.gz

File nbproject/platform.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project name="platform" default="download" basedir="..">
-    <condition property="download.required">
-        <and>
-            <not>
-                <available file="${harness.dir}/suite.xml"/>
-            </not>
-            <isset property="bootstrap.url"/>
-            <isset property="autoupdate.catalog.url"/>
-        </and>
-    </condition>
-    <target name="download" if="download.required">
-        <mkdir dir="${harness.dir}"/>
+    <target name="download" unless="no.download">
+        <mkdir dir="${nbplatform.default.netbeans.dest.dir}"/>
         <pathconvert pathsep="|" property="download.clusters">
             <mapper type="flatten"/>
             <path path="${cluster.path}"/>
         <property name="tasks.jar" location="${java.io.tmpdir}/tasks.jar"/>
         <get src="${bootstrap.url}" dest="${tasks.jar}" usetimestamp="true" verbose="true"/>
         <taskdef name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate" classpath="${tasks.jar}"/>
-        <autoupdate installdir="${nbplatform.active.dir}" updatecenter="${autoupdate.catalog.url}">
+        <autoupdate installdir="${nbplatform.default.netbeans.dest.dir}" updatecenter="${netbeans.updatecenter.url}">
             <modules includes="${module.includes}.*" clusters="${download.clusters}"/>
             <modules includes="org[.]netbeans[.]modules[.]apisupport[.]harness" clusters="harness"/>
         </autoupdate>
+        <autoupdate installdir="${nbplatform.default.netbeans.dest.dir}" updatecenter="${contrib.updatecenter.url}">
+            <modules includes=".*junit4.*" clusters="${download.clusters}"/>
+        </autoupdate>
     </target>
 </project>

File project/nbproject/genfiles.properties

-build.xml.data.CRC32=b7bddca9
+build.xml.data.CRC32=cfd4191d
 build.xml.script.CRC32=eec96eb6
-build.xml.stylesheet.CRC32=a56c6a5b@2.49
+build.xml.stylesheet.CRC32=a56c6a5b@2.50
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=b7bddca9
+nbproject/build-impl.xml.data.CRC32=cfd4191d
 nbproject/build-impl.xml.script.CRC32=9c0b9652
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50

File project/nbproject/project.xml

                     <compile-dependency/>
                     <run-dependency>
                         <release-version>3</release-version>
-                        <specification-version>3.52.0.2</specification-version>
+                        <specification-version>3.49</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.37</specification-version>
+                        <specification-version>1.36.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.25</specification-version>
+                        <specification-version>1.24</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.28</specification-version>
+                        <specification-version>7.27</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>