Mercurial > hg > truffle
changeset 4251:44f3dae303ae
IdealGraphVisualizer: upgrade to NetBeans 7.1 as platform
author | Peter Hofer <peter.hofer@jku.at> |
---|---|
date | Mon, 09 Jan 2012 16:03:02 +0100 |
parents | 0d28d08e1911 |
children | 67e88b7624d5 |
files | src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties src/share/tools/IdealGraphVisualizer/nbproject/platform.properties src/share/tools/IdealGraphVisualizer/nbproject/platform.xml |
diffstat | 4 files changed, 86 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml Mon Jan 09 16:09:41 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml Mon Jan 09 16:03:02 2012 +0100 @@ -38,10 +38,11 @@ </not> </condition> </fail> - <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly."> + <ant antfile="nbproject/platform.xml"/> + <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly. ${line.separator}You may instead download the harness and platform: -Dbootstrap.url=.../tasks.jar -Dautoupdate.catalog.url=.../updates.xml"> <condition> <not> - <available type="dir" file="${harness.dir}"/> + <available file="${harness.dir}/suite.xml"/> </not> </condition> </fail>
--- a/src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties Mon Jan 09 16:09:41 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties Mon Jan 09 16:03:02 2012 +0100 @@ -4,5 +4,8 @@ # 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=3c2c6126 -nbproject/build-impl.xml.script.CRC32=5a29eb53 -nbproject/build-impl.xml.stylesheet.CRC32=183e6ef3@1.45.1 +nbproject/build-impl.xml.script.CRC32=b26e57e5 +nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.47.1 +nbproject/platform.xml.data.CRC32=3c2c6126 +nbproject/platform.xml.script.CRC32=db9e1f43 +nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.47.1
--- a/src/share/tools/IdealGraphVisualizer/nbproject/platform.properties Mon Jan 09 16:09:41 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/nbproject/platform.properties Mon Jan 09 16:03:02 2012 +0100 @@ -2,7 +2,32 @@ ${nbplatform.active.dir}/ide:\ ${nbplatform.active.dir}/platform disabled.modules=\ + com.jcraft.jsch,\ + com.jcraft.jzlib,\ + org.apache.commons.codec,\ + org.apache.commons.httpclient,\ + org.apache.commons.io,\ + org.apache.commons.lang,\ + org.apache.commons.logging,\ + org.apache.ws.commons.util,\ org.apache.xml.resolver,\ + org.apache.xmlrpc,\ + org.eclipse.core.contenttype,\ + org.eclipse.core.jobs,\ + org.eclipse.core.net,\ + org.eclipse.core.runtime,\ + org.eclipse.core.runtime.compatibility.auth,\ + org.eclipse.equinox.app,\ + org.eclipse.equinox.common,\ + org.eclipse.equinox.preferences,\ + org.eclipse.equinox.registry,\ + org.eclipse.equinox.security,\ + org.eclipse.jgit,\ + org.eclipse.mylyn.bugzilla.core,\ + org.eclipse.mylyn.commons.core,\ + org.eclipse.mylyn.commons.net,\ + org.eclipse.mylyn.commons.xmlrpc,\ + org.eclipse.mylyn.tasks.core,\ org.mozilla.rhino.patched,\ org.netbeans.api.debugger,\ org.netbeans.api.java.classpath,\ @@ -10,24 +35,22 @@ org.netbeans.core.browser,\ org.netbeans.core.execution,\ org.netbeans.core.ide,\ + org.netbeans.core.io.ui,\ org.netbeans.core.multiview,\ + org.netbeans.core.nativeaccess,\ + org.netbeans.core.osgi,\ org.netbeans.lib.cvsclient,\ org.netbeans.lib.terminalemulator,\ org.netbeans.libs.antlr3.runtime,\ - org.netbeans.libs.bugtracking,\ - org.netbeans.libs.bugzilla,\ org.netbeans.libs.bytelist,\ - org.netbeans.libs.commons_codec,\ - org.netbeans.libs.commons_logging,\ org.netbeans.libs.commons_net,\ org.netbeans.libs.freemarker,\ + org.netbeans.libs.git,\ org.netbeans.libs.ini4j,\ - org.netbeans.libs.jakarta_oro,\ org.netbeans.libs.jaxb,\ - org.netbeans.libs.jsch,\ org.netbeans.libs.jsr223,\ + org.netbeans.libs.junit4,\ org.netbeans.libs.jvyamlb,\ - org.netbeans.libs.jzlib,\ org.netbeans.libs.lucene,\ org.netbeans.libs.smack,\ org.netbeans.libs.svnClientAdapter,\ @@ -43,6 +66,7 @@ org.netbeans.modules.core.kit,\ org.netbeans.modules.csl.api,\ org.netbeans.modules.css.editor,\ + org.netbeans.modules.css.lib,\ org.netbeans.modules.css.visual,\ org.netbeans.modules.db,\ org.netbeans.modules.db.core,\ @@ -71,6 +95,7 @@ org.netbeans.modules.extexecution,\ org.netbeans.modules.extexecution.destroy,\ org.netbeans.modules.favorites,\ + org.netbeans.modules.git,\ org.netbeans.modules.glassfish.common,\ org.netbeans.modules.gototest,\ org.netbeans.modules.gsf.codecoverage,\ @@ -83,8 +108,10 @@ org.netbeans.modules.html.validation,\ org.netbeans.modules.httpserver,\ org.netbeans.modules.hudson,\ + org.netbeans.modules.hudson.git,\ org.netbeans.modules.hudson.mercurial,\ org.netbeans.modules.hudson.subversion,\ + org.netbeans.modules.hudson.tasklist,\ org.netbeans.modules.ide.kit,\ org.netbeans.modules.image,\ org.netbeans.modules.javascript.editing,\ @@ -93,6 +120,7 @@ org.netbeans.modules.javascript.refactoring,\ org.netbeans.modules.jellytools.ide,\ org.netbeans.modules.jumpto,\ + org.netbeans.modules.keyring.impl,\ org.netbeans.modules.languages,\ org.netbeans.modules.languages.diff,\ org.netbeans.modules.languages.manifest,\ @@ -100,6 +128,7 @@ org.netbeans.modules.lexer.nbbridge,\ org.netbeans.modules.localhistory,\ org.netbeans.modules.mercurial,\ + org.netbeans.modules.netbinox,\ org.netbeans.modules.parsing.api,\ org.netbeans.modules.parsing.lucene,\ org.netbeans.modules.print.editor,\ @@ -120,6 +149,7 @@ org.netbeans.modules.spellchecker.bindings.properties,\ org.netbeans.modules.spellchecker.dictionary_en,\ org.netbeans.modules.spellchecker.kit,\ + org.netbeans.modules.spi.actions,\ org.netbeans.modules.subversion,\ org.netbeans.modules.swing.validation,\ org.netbeans.modules.target.iterator,\ @@ -133,10 +163,11 @@ org.netbeans.modules.utilities.project,\ org.netbeans.modules.versioning,\ org.netbeans.modules.versioning.indexingbridge,\ - org.netbeans.modules.versioning.system.cvss,\ + org.netbeans.modules.versioning.system.cvss.installer,\ org.netbeans.modules.versioning.util,\ org.netbeans.modules.web.client.tools.api,\ org.netbeans.modules.web.common,\ + org.netbeans.modules.web.indent,\ org.netbeans.modules.xml,\ org.netbeans.modules.xml.axi,\ org.netbeans.modules.xml.catalog,\ @@ -165,4 +196,9 @@ org.openide.execution,\ org.openide.options,\ org.openide.util.enumerations +## Not disabled because of NetBeans bug 206347: +## Applications not using OSGi don't start on NbP 7.1 +# org.netbeans.core.netigso,\ +# org.netbeans.libs.felix,\ +# org.netbeans.libs.osgi,\ nbplatform.active=default
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/tools/IdealGraphVisualizer/nbproject/platform.xml Mon Jan 09 16:03:02 2012 +0100 @@ -0,0 +1,34 @@ +<?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}"/> + <pathconvert pathsep="|" property="download.clusters"> + <mapper type="flatten"/> + <path path="${cluster.path}"/> + </pathconvert> + <property name="disabled.modules" value=""/> + <pathconvert property="module.includes" pathsep=""> + <mapper type="glob" from="${basedir}${file.separator}*" to="(?!\Q*\E)"/> + <path> + <filelist files="${disabled.modules}" dir="."/> + </path> + </pathconvert> + <echo message="Downloading clusters ${download.clusters}"/> + <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}"> + <modules includes="${module.includes}.*" clusters="${download.clusters}"/> + <modules includes="org[.]netbeans[.]modules[.]apisupport[.]harness" clusters="harness"/> + </autoupdate> + </target> +</project>