This is an automated email from the ASF dual-hosted git repository.
geertjan 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 c43c13e [NETBEANS-461] Better and more correct way to copy the
extbrowser DLLs from the archive into the build. (#464)
c43c13e is described below
commit c43c13ee240c4409fe74623d09624a4dfd73bc06
Author: Jan Lahoda <[email protected]>
AuthorDate: Tue Mar 27 12:43:33 2018 +0200
[NETBEANS-461] Better and more correct way to copy the extbrowser DLLs from
the archive into the build. (#464)
---
extbrowser/build.xml | 6 ------
extbrowser/nbproject/project.properties | 2 ++
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/extbrowser/build.xml b/extbrowser/build.xml
index 0d4c371..3df5dbd 100644
--- a/extbrowser/build.xml
+++ b/extbrowser/build.xml
@@ -22,12 +22,6 @@
<project name="extbrowser" default="build" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
-
- <property name="resourcesdir" value="./release/modules/lib/"/>
- <target name="-release.dir" depends="projectized-common.-release.dir">
- <mkdir dir="${resourcesdir}"/>
- <unzip src="external/extbrowser-dlls-18.03.15.zip"
dest="${resourcesdir}"/>
- </target>
<target name="jnlp" depends="netbeans,-jnlp-init">
<property name="dir"
location="${jnlp.dest.dir}/${code.name.base.dashes}"/>
diff --git a/extbrowser/nbproject/project.properties
b/extbrowser/nbproject/project.properties
index 3a67448..c00637d 100644
--- a/extbrowser/nbproject/project.properties
+++ b/extbrowser/nbproject/project.properties
@@ -18,6 +18,8 @@
javadoc.arch=${basedir}/arch.xml
# test.unit.cp.extra and/or test.unit.run.cp.extra
javac.source=1.7
+release.external/extbrowser-dlls-18.03.15.zip!/extbrowser.dll=modules/lib/extbrowser.dll
+release.external/extbrowser-dlls-18.03.15.zip!/extbrowser64.dll=modules/lib/extbrowser64.dll
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
**/ExtWebBrowserTest.class,\
--
To stop receiving notification emails like this one, please contact
[email protected].
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
