This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 7ecc2b9 Moved incorrectly merged buildscript (#864)
7ecc2b9 is described below
commit 7ecc2b9f25bcf6c1fa0aced70bd454e2aed5e332
Author: Svatopluk Dedic <svatopluk.de...@oracle.com>
AuthorDate: Wed Sep 12 17:12:37 2018 +0200
Moved incorrectly merged buildscript (#864)
---
libs.jstestdriver/build.xml | 51 -----------------------------------
webcommon/libs.jstestdriver/build.xml | 3 ++-
2 files changed, 2 insertions(+), 52 deletions(-)
diff --git a/libs.jstestdriver/build.xml b/libs.jstestdriver/build.xml
deleted file mode 100644
index d3062db..0000000
--- 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 66a09fa..59dfe7c 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
