1.1 --- a/Libraries/ThirdParty/libs.commons/build.xml Fri Aug 12 14:34:36 2011 +0200
1.2 +++ b/Libraries/ThirdParty/libs.commons/build.xml Fri Aug 12 18:36:48 2011 +0200
1.3 @@ -5,4 +5,14 @@
1.4 <project name="org.netbeans.libs.commons" default="netbeans" basedir=".">
1.5 <description>Builds, tests, and runs the project org.netbeans.libs.commons.</description>
1.6 <import file="nbproject/build-impl.xml"/>
1.7 + <target name="files-init" depends="external,projectized-common.files-init"/>
1.8 + <target name="external">
1.9 + <echo message="Copying commons-io-1.4.jar from IDE"/>
1.10 + <mkdir dir="release/modules/ext"/>
1.11 + <copy file="${nbplatform.default.netbeans.dest.dir}/ide/modules/ext/commons-io-1.4.jar" todir="release/modules/ext/"/>
1.12 + </target>
1.13 + <target name="clean" depends="projectized-common.clean">
1.14 + <echo message="Cleaning release directory"/>
1.15 + <delete dir="release" failonerror="false"/>
1.16 + </target>
1.17 </project>
2.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/build-impl.xml Fri Aug 12 14:34:36 2011 +0200
2.2 +++ b/Libraries/ThirdParty/libs.commons/nbproject/build-impl.xml Fri Aug 12 18:36:48 2011 +0200
2.3 @@ -4,6 +4,13 @@
2.4 *** EDIT ../build.xml INSTEAD ***
2.5 -->
2.6 <project name="org.netbeans.libs.commons-impl" basedir="..">
2.7 + <fail message="Please build using Ant 1.7.1 or higher.">
2.8 + <condition>
2.9 + <not>
2.10 + <antversion atleast="1.7.1"/>
2.11 + </not>
2.12 + </condition>
2.13 + </fail>
2.14 <property file="nbproject/private/suite-private.properties"/>
2.15 <property file="nbproject/suite.properties"/>
2.16 <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
2.17 @@ -16,13 +23,21 @@
2.18 <property name="@{name}" value="${@{value}}"/>
2.19 </sequential>
2.20 </macrodef>
2.21 + <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
2.22 + <attribute name="property"/>
2.23 + <attribute name="value"/>
2.24 + <sequential>
2.25 + <property name="@{property}" value="@{value}"/>
2.26 + </sequential>
2.27 + </macrodef>
2.28 <property file="${user.properties.file}"/>
2.29 <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
2.30 - <nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
2.31 - <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'">
2.32 + <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
2.33 + <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
2.34 + <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
2.35 <condition>
2.36 <not>
2.37 - <available file="${harness.dir}" type="dir"/>
2.38 + <contains string="${cluster.path.evaluated}" substring="platform"/>
2.39 </not>
2.40 </condition>
2.41 </fail>
3.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/genfiles.properties Fri Aug 12 14:34:36 2011 +0200
3.2 +++ b/Libraries/ThirdParty/libs.commons/nbproject/genfiles.properties Fri Aug 12 18:36:48 2011 +0200
3.3 @@ -1,8 +1,8 @@
3.4 -build.xml.data.CRC32=610829b0
3.5 +build.xml.data.CRC32=9503a8ee
3.6 build.xml.script.CRC32=7749a78a
3.7 build.xml.stylesheet.CRC32=a56c6a5b@1.44
3.8 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
3.9 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
3.10 -nbproject/build-impl.xml.data.CRC32=610829b0
3.11 -nbproject/build-impl.xml.script.CRC32=5f8fb834
3.12 -nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@1.44
3.13 +nbproject/build-impl.xml.data.CRC32=9503a8ee
3.14 +nbproject/build-impl.xml.script.CRC32=6199d30f
3.15 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.44
4.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
4.2 +++ b/Libraries/ThirdParty/libs.commons/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
4.3 @@ -1,2 +1,1 @@
4.4 is.autoload=true
4.5 -release.external/commons-io-1.4.jar=${nbplatform.default.netbeans.dest.dir}/ide/modules/ext/commons-io-1.4.jar
5.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/project.xml Fri Aug 12 14:34:36 2011 +0200
5.2 +++ b/Libraries/ThirdParty/libs.commons/nbproject/project.xml Fri Aug 12 18:36:48 2011 +0200
5.3 @@ -15,7 +15,7 @@
5.4 </public-packages>
5.5 <class-path-extension>
5.6 <runtime-relative-path>ext/commons-io-1.4.jar</runtime-relative-path>
5.7 - <binary-origin>${nbplatform.default.netbeans.dest.dir}/ide/modules/ext/commons-io-1.4.jar</binary-origin>
5.8 + <binary-origin>release/modules/ext/commons-io-1.4.jar</binary-origin>
5.9 </class-path-extension>
5.10 </data>
5.11 </configuration>
6.1 --- a/Options/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
6.2 +++ b/Options/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
6.3 @@ -1,3 +1,2 @@
6.4 javac.source=1.6
6.5 javac.compilerargs=-Xlint -Xlint:-serial
6.6 -license.file=../Documentation/License.txt
7.1 --- a/PLSQL/Annotation/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
7.2 +++ b/PLSQL/Annotation/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
7.3 @@ -1,3 +1,2 @@
7.4 javac.source=1.6
7.5 javac.compilerargs=-Xlint -Xlint:-serial
7.6 -license.file=../../Documentation/License.txt
8.1 --- a/PLSQL/Completion/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
8.2 +++ b/PLSQL/Completion/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
8.3 @@ -1,3 +1,2 @@
8.4 javac.source=1.6
8.5 javac.compilerargs=-Xlint -Xlint:-serial
8.6 -license.file=../../Documentation/License.txt
9.1 --- a/PLSQL/Debugging/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
9.2 +++ b/PLSQL/Debugging/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
9.3 @@ -1,3 +1,2 @@
9.4 javac.source=1.6
9.5 javac.compilerargs=-Xlint -Xlint:-serial -extdirs "${jdk.home}/lib"
9.6 -license.file=../../Documentation/License.txt
10.1 --- a/PLSQL/Execution/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
10.2 +++ b/PLSQL/Execution/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
10.3 @@ -1,3 +1,2 @@
10.4 javac.source=1.6
10.5 javac.compilerargs=-Xlint -Xlint:-serial
10.6 -license.file=../../Documentation/License.txt
11.1 --- a/PLSQL/FileType/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
11.2 +++ b/PLSQL/FileType/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
11.3 @@ -1,4 +1,3 @@
11.4 javac.source=1.6
11.5 javac.compilerargs=-Xlint -Xlint:-serial
11.6 javahelp.hs=filetype-hs.xml
11.7 -license.file=../../Documentation/License.txt
12.1 --- a/PLSQL/Folding/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
12.2 +++ b/PLSQL/Folding/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
12.3 @@ -1,3 +1,2 @@
12.4 javac.source=1.6
12.5 javac.compilerargs=-Xlint -Xlint:-serial
12.6 -license.file=../../Documentation/License.txt
13.1 --- a/PLSQL/Formatter/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
13.2 +++ b/PLSQL/Formatter/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
13.3 @@ -1,3 +1,2 @@
13.4 javac.source=1.6
13.5 javac.compilerargs=-Xlint -Xlint:-serial
13.6 -license.file=../../Documentation/License.txt
14.1 --- a/PLSQL/FormattingOptions/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
14.2 +++ b/PLSQL/FormattingOptions/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
14.3 @@ -1,3 +1,2 @@
14.4 javac.source=1.6
14.5 javac.compilerargs=-Xlint -Xlint:-serial
14.6 -license.file=../../Documentation/License.txt
15.1 --- a/PLSQL/Hyperlink/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
15.2 +++ b/PLSQL/Hyperlink/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
15.3 @@ -1,3 +1,2 @@
15.4 javac.source=1.6
15.5 javac.compilerargs=-Xlint -Xlint:-serial
15.6 -license.file=../../Documentation/License.txt
16.1 --- a/PLSQL/Lexer/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
16.2 +++ b/PLSQL/Lexer/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
16.3 @@ -1,3 +1,2 @@
16.4 javac.source=1.6
16.5 javac.compilerargs=-Xlint -Xlint:-serial
16.6 -license.file=../../Documentation/License.txt
17.1 --- a/PLSQL/Navigator/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
17.2 +++ b/PLSQL/Navigator/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
17.3 @@ -1,3 +1,2 @@
17.4 javac.source=1.6
17.5 javac.compilerargs=-Xlint -Xlint:-serial
17.6 -license.file=../../Documentation/License.txt
18.1 --- a/PLSQL/Palette/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
18.2 +++ b/PLSQL/Palette/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
18.3 @@ -1,3 +1,2 @@
18.4 javac.source=1.6
18.5 javac.compilerargs=-Xlint -Xlint:-serial
18.6 -license.file=../../Documentation/License.txt
19.1 --- a/PLSQL/Usage/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
19.2 +++ b/PLSQL/Usage/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
19.3 @@ -1,3 +1,2 @@
19.4 javac.source=1.6
19.5 javac.compilerargs=-Xlint -Xlint:-serial
19.6 -license.file=../../Documentation/License.txt
20.1 --- a/PLSQL/Utilities/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
20.2 +++ b/PLSQL/Utilities/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
20.3 @@ -1,3 +1,2 @@
20.4 javac.source=1.6
20.5 javac.compilerargs=-Xlint -Xlint:-serial
20.6 -license.file=../../Documentation/License.txt
21.1 --- a/Utilities/Oracle/nbproject/project.properties Fri Aug 12 14:34:36 2011 +0200
21.2 +++ b/Utilities/Oracle/nbproject/project.properties Fri Aug 12 18:36:48 2011 +0200
21.3 @@ -1,3 +1,2 @@
21.4 javac.source=1.6
21.5 javac.compilerargs=-Xlint -Xlint:-serial
21.6 -license.file=../../Documentation/License.txt
22.1 --- a/build.properties Fri Aug 12 14:34:36 2011 +0200
22.2 +++ b/build.properties Fri Aug 12 18:36:48 2011 +0200
22.3 @@ -1,4 +1,4 @@
22.4 # netbeans.base.url=http://bits.netbeans.org/download/trunk/nightly/latest/zip/
22.5 netbeans.base.url=http://smetiste.czech.sun.com/builds/netbeans/trunk/daily/latest/zip/
22.6 -nbplatform.default.harness.dir=${nbplatform.default.netbeans.dest.dir}/harness
22.7 -nbplatform.default.netbeans.dest.dir=/space/source/plsql-support/ide/netbeans
22.8 +# nbplatform.default.harness.dir=${nbplatform.default.netbeans.dest.dir}/harness
22.9 +# nbplatform.default.netbeans.dest.dir=/space/source/xxx/ide/netbeans
23.1 --- a/build.xml Fri Aug 12 14:34:36 2011 +0200
23.2 +++ b/build.xml Fri Aug 12 18:36:48 2011 +0200
23.3 @@ -5,7 +5,6 @@
23.4 <project name="plsql support" basedir="." default="netbeans">
23.5 <description>Builds the module suite plsql support.</description>
23.6
23.7 -
23.8 <property file="build.properties"/>
23.9
23.10 <property name="use.timestamp" value="true"/>
23.11 @@ -79,4 +78,16 @@
23.12 <delete file="${timestamp.file}"/>
23.13 </target>
23.14
23.15 + <target name="nbms" depends="update-binaries">
23.16 + <ant antfile="build-suite.xml" target="nbms" inheritAll="false"/>
23.17 + </target>
23.18 +
23.19 + <target name="daily" depends="update-binaries,build">
23.20 + <mkdir dir="dist"/>
23.21 + <zip destfile="dist/netbeans-trunk-${build.id}-plsql.zip" duplicate="add">
23.22 + <zipfileset dir="build/cluster" prefix="netbeans/extra"/>
23.23 + <zipfileset dir="ide/netbeans" prefix="netbeans"/>
23.24 + </zip>
23.25 + </target>
23.26 +
23.27 </project>