[GitHub] geertjanw closed pull request #464: [NETBEANS-461] Better and more correct way to copy the extbrowser DLL���

[GitBox <gi...@apache.org>]

geertjanw closed pull request #464: [NETBEANS-461] Better and more correct way to copy the extbrowser DLL…
URL: https://github.com/apache/incubator-netbeans/pull/464
 
 
   

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/extbrowser/build.xml b/extbrowser/build.xml
index 170491f59..90ee426bb 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 3a6744892..c00637de8 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,\


 

----------------------------------------------------------------
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