You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/09/12 15:12:42 UTC
[GitHub] sdedic closed pull request #864: Moved incorrectly merged
buildscript
sdedic closed pull request #864: Moved incorrectly merged buildscript
URL: https://github.com/apache/incubator-netbeans/pull/864
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/libs.jstestdriver/build.xml b/libs.jstestdriver/build.xml
deleted file mode 100644
index d3062db7ff..0000000000
--- a/libs.jstestdriver/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project basedir="." default="netbeans" name="libs.jstestdriver">
- <description>Builds, tests, and runs the project libs.jstestdriver</description>
- <import file="../nbbuild/templates/projectized.xml"/>
-
- <target name="ext-compile" depends="build-init">
- <mkdir dir="build/extclasses"/>
- <javac srcdir="extsrc" destdir="build/extclasses" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.6">
- <classpath>
- <path path="${module.classpath}"/>
- <path location="${cluster}/${module.jar}"/>
- <path path="${extsrc.cp.extra}"/>
- </classpath>
- </javac>
- <copy todir="build/extclasses">
- <fileset dir="extsrc" excludes="${jar-excludes}"/>
- </copy>
- </target>
-
- <target name="ext-jar" depends="ext-compile">
- <mkdir dir="build/external"/>
- <jar jarfile="build/external/libs.jstestdriver-ext.jar" compress="false">
- <fileset dir="build/extclasses"/>
- </jar>
- </target>
-
- <target name="build-wrapper" depends="netbeans,ext-jar"/>
-
- <target name="-process.release.files" depends="projectized.-process.release.files,ext-jar"/>
-
-</project>
diff --git a/webcommon/libs.jstestdriver/build.xml b/webcommon/libs.jstestdriver/build.xml
index 66a09fae34..59dfe7c53a 100644
--- a/webcommon/libs.jstestdriver/build.xml
+++ b/webcommon/libs.jstestdriver/build.xml
@@ -23,7 +23,7 @@
<description>Builds, tests, and runs the project libs.jstestdriver</description>
<import file="../../nbbuild/templates/projectized.xml"/>
- <target name="ext-compile">
+ <target name="ext-compile" depends="build-init">
<mkdir dir="build/extclasses"/>
<javac srcdir="extsrc" destdir="build/extclasses" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.6">
<classpath>
@@ -46,5 +46,6 @@
<target name="build-wrapper" depends="netbeans,ext-jar"/>
+ <target name="-process.release.files" depends="projectized.-process.release.files,ext-jar"/>
</project>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists