Fixed build problems for licensechanger.
authorNils Hoffmann <nhoffmann@netbeans.org>
Fri, 14 Sep 2012 19:05:55 +0200
changeset 17961e4056f3326c8
parent 17880 59cd23a98feb
child 17963 657783c6b137
Fixed build problems for licensechanger.
licensechanger/build.xml
licensechanger/nbproject/build-impl.xml
licensechanger/nbproject/genfiles.properties
licensechanger/nbproject/platform.properties
licensechanger/nbproject/project.xml
     1.1 --- a/licensechanger/build.xml	Fri Sep 14 01:53:25 2012 -0400
     1.2 +++ b/licensechanger/build.xml	Fri Sep 14 19:05:55 2012 +0200
     1.3 @@ -1,8 +1,34 @@
     1.4  <?xml version="1.0" encoding="UTF-8"?>
     1.5 -<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
     1.6 -<!-- for some information on what you could do (e.g. targets to override). -->
     1.7 -<!-- If you delete this file and reopen the project it will be recreated. -->
     1.8 -<project name="org.netbeans.modules.licensechanger" default="netbeans" basedir=".">
     1.9 -    <description>Builds, tests, and runs the project org.netbeans.modules.licensechanger.</description>
    1.10 -    <import file="nbproject/build-impl.xml"/>
    1.11 +<project basedir="." default="netbeans" name="contrib/licensechanger">
    1.12 +
    1.13 +    <import file="../../nbbuild/templates/projectized.xml"/>
    1.14 +<!--
    1.15 +    <target name="compile" depends="projectized-common.compile">
    1.16 +        <mkdir dir="${build.classes.dir}/org/netbeans/modules/licensechanger/licenses"/>
    1.17 +        <copy todir="${build.classes.dir}/org/netbeans/modules/licensechanger/licenses">
    1.18 +            <fileset dir="${basedir}/../../nbbuild/licenses">-->
    1.19 +                 <!--XXX would it be better to just include the ones we _do_ want? -->
    1.20 +<!--                <exclude name="ANTLR-2"/>
    1.21 +                <exclude name="Apache-1.1-xmlunit_variant"/>
    1.22 +                <exclude name="Apache-2.0-Vera-Perseus"/>
    1.23 +                <exclude name="Apache-JDOM"/>
    1.24 +                <exclude name="BSD-jsch-variant"/>
    1.25 +                <exclude name="DOM4J-BSD"/>
    1.26 +                <exclude name="GPL-with-Proguard-exception"/>
    1.27 +                <exclude name="HttpUnit"/>
    1.28 +                <exclude name="Northwoods"/>
    1.29 +                <exclude name="Subversion"/>
    1.30 +                <exclude name="TEL_For_NB_dbxGUI"/>
    1.31 +                <exclude name="cobertura"/>
    1.32 +                <exclude name="freemarker"/>
    1.33 +                <exclude name="prefuse-BSD"/>
    1.34 +            </fileset>
    1.35 +        </copy>
    1.36 +        <fileset dir="${build.classes.dir}/org/netbeans/modules/licensechanger/licenses" id="license.files"/>
    1.37 +        <pathconvert property="license.files.nl" pathsep="&#10;" refid="license.files">
    1.38 +            <mapper type="flatten"/>
    1.39 +        </pathconvert>
    1.40 +        <echo file="${build.classes.dir}/org/netbeans/modules/licensechanger/licenses.txt" message="${license.files.nl}"/>
    1.41 +    </target>
    1.42 +-->
    1.43  </project>
     2.1 --- a/licensechanger/nbproject/build-impl.xml	Fri Sep 14 01:53:25 2012 -0400
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,42 +0,0 @@
     2.4 -<?xml version="1.0" encoding="UTF-8"?>
     2.5 -<!--
     2.6 -*** GENERATED FROM project.xml - DO NOT EDIT  ***
     2.7 -***         EDIT ../build.xml INSTEAD         ***
     2.8 --->
     2.9 -<project name="org.netbeans.modules.licensechanger-impl" basedir="..">
    2.10 -    <fail message="Please build using Ant 1.7.1 or higher.">
    2.11 -        <condition>
    2.12 -            <not>
    2.13 -                <antversion atleast="1.7.1"/>
    2.14 -            </not>
    2.15 -        </condition>
    2.16 -    </fail>
    2.17 -    <property file="nbproject/private/platform-private.properties"/>
    2.18 -    <property file="nbproject/platform.properties"/>
    2.19 -    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
    2.20 -        <attribute name="name"/>
    2.21 -        <attribute name="value"/>
    2.22 -        <sequential>
    2.23 -            <property name="@{name}" value="${@{value}}"/>
    2.24 -        </sequential>
    2.25 -    </macrodef>
    2.26 -    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
    2.27 -        <attribute name="property"/>
    2.28 -        <attribute name="value"/>
    2.29 -        <sequential>
    2.30 -            <property name="@{property}" value="@{value}"/>
    2.31 -        </sequential>
    2.32 -    </macrodef>
    2.33 -    <property file="${user.properties.file}"/>
    2.34 -    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
    2.35 -    <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.36 -    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
    2.37 -    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
    2.38 -        <condition>
    2.39 -            <not>
    2.40 -                <contains string="${cluster.path.evaluated}" substring="platform"/>
    2.41 -            </not>
    2.42 -        </condition>
    2.43 -    </fail>
    2.44 -    <import file="${harness.dir}/build.xml"/>
    2.45 -</project>
     3.1 --- a/licensechanger/nbproject/genfiles.properties	Fri Sep 14 01:53:25 2012 -0400
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,8 +0,0 @@
     3.4 -build.xml.data.CRC32=5f509671
     3.5 -build.xml.script.CRC32=d3b0f448
     3.6 -build.xml.stylesheet.CRC32=a56c6a5b@2.47.2
     3.7 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     3.8 -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     3.9 -nbproject/build-impl.xml.data.CRC32=5f509671
    3.10 -nbproject/build-impl.xml.script.CRC32=b50b3f1d
    3.11 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.2
     4.1 --- a/licensechanger/nbproject/platform.properties	Fri Sep 14 01:53:25 2012 -0400
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,19 +0,0 @@
     4.4 -cluster.path=\
     4.5 -    ${nbplatform.active.dir}/dlight:\
     4.6 -    ${nbplatform.active.dir}/harness:\
     4.7 -    ${nbplatform.active.dir}/cnd:\
     4.8 -    ${nbplatform.active.dir}/apisupport:\
     4.9 -    ${nbplatform.active.dir}/enterprise:\
    4.10 -    ${nbplatform.active.dir}/java:\
    4.11 -    ${nbplatform.active.dir}/websvccommon:\
    4.12 -    ${nbplatform.active.dir}/platform:\
    4.13 -    ${nbplatform.active.dir}/webcommon:\
    4.14 -    ${nbplatform.active.dir}/groovy:\
    4.15 -    ${nbplatform.active.dir}/nb:\
    4.16 -    ${nbplatform.active.dir}/javafx:\
    4.17 -    ${nbplatform.active.dir}/mobility:\
    4.18 -    ${nbplatform.active.dir}/php:\
    4.19 -    ${nbplatform.active.dir}/ergonomics:\
    4.20 -    ${nbplatform.active.dir}/profiler:\
    4.21 -    ${nbplatform.active.dir}/ide
    4.22 -nbplatform.active=default
     5.1 --- a/licensechanger/nbproject/project.xml	Fri Sep 14 01:53:25 2012 -0400
     5.2 +++ b/licensechanger/nbproject/project.xml	Fri Sep 14 19:05:55 2012 +0200
     5.3 @@ -4,7 +4,6 @@
     5.4      <configuration>
     5.5          <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
     5.6              <code-name-base>org.netbeans.modules.licensechanger</code-name-base>
     5.7 -            <standalone/>
     5.8              <module-dependencies>
     5.9                  <dependency>
    5.10                      <code-name-base>org.netbeans.api.progress</code-name-base>