Merge build system changes from nb-vw-integration branch to trunk to be integrated with the NB build system.
1.1 --- a/ide.servicestab/build.xml Mon Apr 23 12:54:15 2007 +0000
1.2 +++ b/ide.servicestab/build.xml Mon Apr 23 15:50:05 2007 +0000
1.3 @@ -1,12 +1,5 @@
1.4 <?xml version="1.0" encoding="UTF-8"?>
1.5 -<!--
1.6 <project basedir="." default="netbeans" name="ide/services">
1.7 <description>Builds, tests, and runs the project org.netbeans.servicestab</description>
1.8 <import file="../../nbbuild/templates/projectized.xml"/>
1.9 </project>
1.10 --->
1.11 -<project name="org.netbeans.ide.servicestab" default="netbeans" basedir=".">
1.12 - <description>Builds, tests, and runs the project org.netbeans.servicestab.</description>
1.13 - <import file="nbproject/build-impl.xml"/>
1.14 - <import file="${suite.dir}/templates/common.xml"/>
1.15 -</project>
2.1 --- a/ide.servicestab/nbproject/project.xml Mon Apr 23 12:54:15 2007 +0000
2.2 +++ b/ide.servicestab/nbproject/project.xml Mon Apr 23 15:50:05 2007 +0000
2.3 @@ -2,9 +2,8 @@
2.4 <project xmlns="http://www.netbeans.org/ns/project/1">
2.5 <type>org.netbeans.modules.apisupport.project</type>
2.6 <configuration>
2.7 - <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
2.8 + <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
2.9 <code-name-base>org.netbeans.modules.ide.servicestab</code-name-base>
2.10 - <suite-component/>
2.11 <module-dependencies>
2.12 <dependency>
2.13 <code-name-base>org.jdesktop.layout</code-name-base>
3.1 --- a/visualweb.designer.decoration/build.xml Mon Apr 23 12:54:15 2007 +0000
3.2 +++ b/visualweb.designer.decoration/build.xml Mon Apr 23 15:50:05 2007 +0000
3.3 @@ -20,5 +20,5 @@
3.4
3.5 <project name="org.netbeans.modules.visualweb.designer.decoration" default="netbeans" basedir=".">
3.6 <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.designer.decoration.</description>
3.7 - <import file="nbproject/build-impl.xml"/>
3.8 + <import file="../../../nbbuild/templates/projectized.xml"/>
3.9 </project>
4.1 --- a/visualweb.designer.decoration/nbproject/project.xml Mon Apr 23 12:54:15 2007 +0000
4.2 +++ b/visualweb.designer.decoration/nbproject/project.xml Mon Apr 23 15:50:05 2007 +0000
4.3 @@ -20,7 +20,7 @@
4.4 <project xmlns="http://www.netbeans.org/ns/project/1">
4.5 <type>org.netbeans.modules.apisupport.project</type>
4.6 <configuration>
4.7 - <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
4.8 + <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
4.9 <code-name-base>org.netbeans.modules.visualweb.designer.decoration</code-name-base>
4.10 <standalone/>
4.11 <module-dependencies>
5.1 --- a/visualweb.project.importpage/build.xml Mon Apr 23 12:54:15 2007 +0000
5.2 +++ b/visualweb.project.importpage/build.xml Mon Apr 23 15:50:05 2007 +0000
5.3 @@ -23,6 +23,5 @@
5.4 <!-- If you delete this file and reopen the project it will be recreated. -->
5.5 <project name="org.netbeans.modules.visualweb.project.importpage" default="netbeans" basedir=".">
5.6 <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.project.importpage.</description>
5.7 - <import file="nbproject/build-impl.xml"/>
5.8 - <import file="${suite.dir}/templates/common.xml"/>
5.9 + <import file="../../../nbbuild/templates/projectized.xml"/>
5.10 </project>
6.1 --- a/visualweb.project.importpage/nbproject/project.xml Mon Apr 23 12:54:15 2007 +0000
6.2 +++ b/visualweb.project.importpage/nbproject/project.xml Mon Apr 23 15:50:05 2007 +0000
6.3 @@ -21,9 +21,8 @@
6.4 <project xmlns="http://www.netbeans.org/ns/project/1">
6.5 <type>org.netbeans.modules.apisupport.project</type>
6.6 <configuration>
6.7 - <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
6.8 + <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
6.9 <code-name-base>org.netbeans.modules.visualweb.project.importpage</code-name-base>
6.10 - <suite-component/>
6.11 <module-dependencies>
6.12 <dependency>
6.13 <code-name-base>org.netbeans.modules.visualweb.api.designer</code-name-base>