You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by cm...@apache.org on 2014/12/05 23:41:31 UTC
svn commit: r1643464 - in /openoffice/devtools/netbeansintegration/trunk:
manifest.mf
project_templates/UNOClientAppProject/nbproject/build-uno-impl.xml
Author: cmarcum
Date: Fri Dec 5 22:41:31 2014
New Revision: 1643464
URL: http://svn.apache.org/r1643464
Log:
#i78645#
Added the folowing to UNOClientAppProject template build-uno-impl.xml jar target that overrides jar target in standard java se build-impl.xml
-do-jar-without-libraries,-do-jar-with-libraries
This adds library jars to /dist/lib and also Class Path entries in jar manifest for client applications.
Modified:
openoffice/devtools/netbeansintegration/trunk/manifest.mf
openoffice/devtools/netbeansintegration/trunk/project_templates/UNOClientAppProject/nbproject/build-uno-impl.xml
Modified: openoffice/devtools/netbeansintegration/trunk/manifest.mf
URL: http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/manifest.mf?rev=1643464&r1=1643463&r2=1643464&view=diff
==============================================================================
--- openoffice/devtools/netbeansintegration/trunk/manifest.mf (original)
+++ openoffice/devtools/netbeansintegration/trunk/manifest.mf Fri Dec 5 22:41:31 2014
@@ -4,7 +4,7 @@ OpenIDE-Module-Layer: org/openoffice/ext
OpenIDE-Module-Localizing-Bundle: org/openoffice/extensions/Bundle.properties
OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help
OpenIDE-Module-Install: org/openoffice/extensions/config/OOoModuleInstall.class
-OpenIDE-Module-Specification-Version: 4.0.6
+OpenIDE-Module-Specification-Version: 4.0.7
Name: org/openoffice/extensions/filetypes/odf/OdfDataLoader.class
OpenIDE-Module-Class: Loader
Modified: openoffice/devtools/netbeansintegration/trunk/project_templates/UNOClientAppProject/nbproject/build-uno-impl.xml
URL: http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/project_templates/UNOClientAppProject/nbproject/build-uno-impl.xml?rev=1643464&r1=1643463&r2=1643464&view=diff
==============================================================================
--- openoffice/devtools/netbeansintegration/trunk/project_templates/UNOClientAppProject/nbproject/build-uno-impl.xml (original)
+++ openoffice/devtools/netbeansintegration/trunk/project_templates/UNOClientAppProject/nbproject/build-uno-impl.xml Fri Dec 5 22:41:31 2014
@@ -24,7 +24,7 @@
</target>
<!-- jar including manifest: usr's own or a created one -->
- <target name="jar" depends="-uno-project-init,compile,-pre-jar,-do-jar-jar,-do-openoffice-manifest,-post-jar">
+ <target name="jar" depends="-uno-project-init,compile,-pre-jar,-do-jar-jar,-do-jar-without-libraries,-do-jar-with-libraries,-do-openoffice-manifest,-post-jar">
<jar basedir="${build.classes.dir}" manifest="${build.dir}/MANIFEST.MF" filesonly="true" compress="true" jarfile="${dist.jar}">
<fileset refid="bootstrap.glue.code"/>
</jar>