Improved netbeans harness/platform build

This commit is contained in:
adam-m 2012-06-21 11:09:30 -04:00
parent b95811ffee
commit 3e1819036d
3 changed files with 8 additions and 24 deletions

2
.gitignore vendored
View File

@ -27,3 +27,5 @@ genfiles.properties
/Testing/script/output/ /Testing/script/output/
/Testing/script/gold/ /Testing/script/gold/
*~ *~
/netbeans-plat

View File

@ -5,12 +5,6 @@
<project name="Autopsy3" basedir="."> <project name="Autopsy3" basedir=".">
<description>Builds the module suite Autopsy3.</description> <description>Builds the module suite Autopsy3.</description>
<!-- Netbeans RCP platform -->
<property name="netbeans-plat.version" value="7.0.1"/>
<property name="nbplatform.active.dir" value="${basedir}/thirdparty/netbeans-plat/${netbeans-plat.version}"/>
<!-- harness for bootstrapping -->
<property name="harness.dir" value="${basedir}/thirdparty/netbeans-plat/harness"/>
<import file="nbproject/build-impl.xml"/> <import file="nbproject/build-impl.xml"/>
<condition property="os.family" value="unix"> <condition property="os.family" value="unix">
@ -33,23 +27,6 @@
</taskdef> </taskdef>
<!-- Netbeans RCP platform download helper -->
<property name="netbeans-plat.dir"
value="${thirdparty.dir}/netbeans-plat/${netbeans-plat.version}"/>
<property name="bootstrap.url"
value="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar"/>
<property name="netbeans.updatecenter.url"
value="http://updates.netbeans.org/netbeans/updates/${netbeans-plat.version}/uc/final/distribution/catalog.xml.gz"/>
<target name="download-netbeans-rcp" description="helper target to downloads netbeans platform">
<mkdir dir="${netbeans-plat.dir}/harness"/>
<get src="${bootstrap.url}" dest="${netbeans-plat.dir}/harness/tasks.jar" usetimestamp="true" verbose="true"/>
<taskdef name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate" classpath="${netbeans-plat.dir}/harness/tasks.jar"/>
<autoupdate installdir="${netbeans-plat.dir}" updatecenter="${netbeans.updatecenter.url}">
<modules includes=".*" clusters="harness[0-9]*"/>
<modules includes=".*" clusters="platform[0-9]*"/>
</autoupdate>
</target>
<!-- This seems really bad to be hard coded, but I couldn't find a better solution --> <!-- This seems really bad to be hard coded, but I couldn't find a better solution -->
<path id="jni-path"> <path id="jni-path">
<pathelement location="${basedir}/build/cluster/modules/org-sleuthkit-datamodel.jar"/> <pathelement location="${basedir}/build/cluster/modules/org-sleuthkit-datamodel.jar"/>

View File

@ -1,3 +1,9 @@
netbeans-plat-version=7.0.1
suite.dir=${basedir}
nbplatform.active.dir=${suite.dir}/netbeans-plat/${netbeans-plat-version}
harness.dir=${nbplatform.active.dir}/harness
bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
autoupdate.catalog.url=http://updates.netbeans.org/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
cluster.path=\ cluster.path=\
${nbplatform.active.dir}/harness:\ ${nbplatform.active.dir}/harness:\
${nbplatform.active.dir}/java:\ ${nbplatform.active.dir}/java:\
@ -97,4 +103,3 @@ disabled.modules=\
org.netbeans.modules.xml.tools.java,\ org.netbeans.modules.xml.tools.java,\
org.openide.compat,\ org.openide.compat,\
org.openide.util.enumerations org.openide.util.enumerations
nbplatform.active=default