[ooo-build-commit] ooeclipse: Branch 'master' - 2 commits

Cédric Bosdonnat cbosdo at kemper.freedesktop.org
Wed Nov 24 13:42:23 PST 2010


 build/site_header.xml                  |    2 
 core/META-INF/MANIFEST.MF              |    2 
 core/build/MANIFEST.MF.in              |    7 +-
 core/build/build.xml                   |    6 +-
 core/build/feature.xml.in              |   15 ++---
 core/build/site_fragment.xml.in        |    2 
 cpp/build/MANIFEST.MF.in               |    2 
 cpp/build/build.xml                    |    1 
 cpp/build/feature.xml.in               |   10 +--
 java/build/MANIFEST.MF.in              |    4 -
 java/build/build.xml                   |    1 
 java/build/feature.xml.in              |   17 ++----
 java/build/site_fragment.xml.in        |    2 
 packager/.classpath                    |    2 
 packager/.externalToolBuilders/Sources |   20 +++++++
 packager/.gitignore                    |    1 
 packager/.project                      |   10 +++
 packager/META-INF/MANIFEST.MF          |    3 -
 packager/README.txt                    |    4 +
 packager/build.properties              |    5 -
 packager/build/MANIFEST.MF.in          |    3 -
 packager/build/build.properties        |    4 -
 packager/build/build.xml               |   86 ++++++++++++++++-----------------
 23 files changed, 119 insertions(+), 90 deletions(-)

New commits:
commit fb37332199e4ee3e15a210f6980468b2e41b5fdd
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Wed Nov 24 22:36:48 2010 +0100

    Changed OpenOffice.org into LibreOffice in several places

diff --git a/build/site_header.xml b/build/site_header.xml
index 4862fc6..bab3301 100644
--- a/build/site_header.xml
+++ b/build/site_header.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <category-def name="OpenOffice.org" label="OpenOffice.org"/>
+   <category-def name="LibreOffice" label="LibreOffice"/>
    
diff --git a/core/META-INF/MANIFEST.MF b/core/META-INF/MANIFEST.MF
index 077181a..852debb 100755
--- a/core/META-INF/MANIFEST.MF
+++ b/core/META-INF/MANIFEST.MF
@@ -53,5 +53,5 @@ Export-Package: org.openoffice.ide.eclipse.core,
  org.openoffice.ide.eclipse.core.wizards,
  org.openoffice.ide.eclipse.core.wizards.pages,
  org.openoffice.ide.eclipse.core.wizards.utils
-Bundle-Vendor: OpenOffice.org
+Bundle-Vendor: LibreOffice
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/build/MANIFEST.MF.in b/core/build/MANIFEST.MF.in
index ce80bd2..5916611 100755
--- a/core/build/MANIFEST.MF.in
+++ b/core/build/MANIFEST.MF.in
@@ -18,8 +18,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.junit,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
- org.eclipse.ui,
- javax.xml
+ org.eclipse.ui;bundle-version="3.4.1",
+ javax.xml;bundle-version="1.3.4",
+ org.openoffice.ide.packager.core;bundle-version="0.1.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.openoffice.ide.eclipse.core,
  org.openoffice.ide.eclipse.core.actions,
@@ -52,5 +53,5 @@ Export-Package: org.openoffice.ide.eclipse.core,
  org.openoffice.ide.eclipse.core.wizards,
  org.openoffice.ide.eclipse.core.wizards.pages,
  org.openoffice.ide.eclipse.core.wizards.utils
-Bundle-Vendor: OpenOffice.org
+Bundle-Vendor: Cédric Bosdonnat
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/build/build.xml b/core/build/build.xml
index 9e5e320..6dd3777 100644
--- a/core/build/build.xml
+++ b/core/build/build.xml
@@ -42,7 +42,7 @@
 
 <project name="core" default="core.error">
 	
-    <import file="../packager/build/build.xml"/>
+    <import file="../../packager/build/build.xml"/>
 
 	<target name="core.error">
 		<fail>Wrong target!
@@ -67,6 +67,10 @@
 			<fileset dir="${eclipse.home}/plugins/">
 				<include name="org.eclipse*.jar"/>
 			</fileset>
+			
+			<fileset dir="${core.basedir}/../packager">
+				<include name="*.jar"/>
+			</fileset>
 		</path>
 		
 		<mkdir dir="${core.out.path}/features" />
diff --git a/core/build/feature.xml.in b/core/build/feature.xml.in
index c677e92..9f4ee9e 100644
--- a/core/build/feature.xml.in
+++ b/core/build/feature.xml.in
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.openoffice.ide.eclipse.core"
-      label="OpenOffice.org development plugin core"
+      label="LibreOffice development plugin core"
       version="@VERSION@"
       provider-name="Cédric Bosdonnat">
 
    <description>
-      Tool to support OpenOffice.org development using Eclipse. It
+      Tool to support LibreOffice development using Eclipse. It
 provides two editors for UNO-IDL file edition and registry files
 viewing. The plugin helps the user to write it&apos;s UNO-IDL file
 with syntax highlighting and some wizards, it although generates
@@ -23,15 +23,12 @@ This plugin is user oriented and integrate some cheat sheets
 to guide the new user throught different steps.
 Even if this is a important piece of work, there are still other
 features to add and bugs to correct, please do not hesitate to
-express your remarks and requests on the dev at api openoffice mailing
-list.
+express your remarks and requests on the LibreOffice development 
+mailing list.
    </description>
 
    <copyright>
-      The Initial Developer of the Original Code is: Sun Microsystems,Inc..
-Copyright: 2002 by Sun Microsystems, Inc.
-All Rights Reserved.
-Contributor(s): Cedric Bosdonnat
+Copyright: (c) 2010 Cedric Bosdonnat
    </copyright>
 
    <license url="http://www.openoffice.org/license.html">
@@ -54,7 +51,7 @@ MA 02111-1307 USA
    </license>
 
    <url>
-      <update label="OpenOffice.org Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
+      <update label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
    </url>
 
    <plugin
diff --git a/core/build/site_fragment.xml.in b/core/build/site_fragment.xml.in
index 6575594..c71e136 100644
--- a/core/build/site_fragment.xml.in
+++ b/core/build/site_fragment.xml.in
@@ -1,7 +1,7 @@
    <feature 
    		url="features/org.openoffice.ide.eclipse.core_ at VERSION@.jar" 
    		id="org.openoffice.ide.eclipse.core" version="@VERSION@">
-      <category name="OpenOffice.org"/>
+      <category name="LibreOffice"/>
    </feature>
    
    
\ No newline at end of file
diff --git a/cpp/build/MANIFEST.MF.in b/cpp/build/MANIFEST.MF.in
index f30c0b3..03a0cd1 100644
--- a/cpp/build/MANIFEST.MF.in
+++ b/cpp/build/MANIFEST.MF.in
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: C++ extensions support for OOo
+Bundle-Name: C++ extensions support for LibreOffice
 Bundle-SymbolicName: org.openoffice.ide.eclipse.cpp;singleton:=true
 Bundle-Version: @VERSION@
 Bundle-Activator: org.openoffice.ide.eclipse.cpp.Activator
diff --git a/cpp/build/build.xml b/cpp/build/build.xml
index 8a1b5be..e5b7635 100644
--- a/cpp/build/build.xml
+++ b/cpp/build/build.xml
@@ -61,6 +61,7 @@
 		<property name="cpp.sources" value="${cpp.basedir}/source"/>
 		
 		<path id="cpp.dependencies.path">
+			<pathelement location="${packager.out.classes}"/>
 			<pathelement location="${core.out.classes}"/>
 			
 			<fileset dir="${eclipse.home}/plugins/">
diff --git a/cpp/build/feature.xml.in b/cpp/build/feature.xml.in
index ace5a83..a49e0a7 100644
--- a/cpp/build/feature.xml.in
+++ b/cpp/build/feature.xml.in
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.openoffice.ide.eclipse.cpp"
-      label="OpenOffice.org development plugin support for C++ implementation"
+      label="LibreOffice development plugin support for C++ implementation"
       version="@VERSION@"
       provider-name="Cédric Bosdonnat">
 
    <description>
-This plugin provides the support of C++ implementation for OpenOffice.org
-component development. This plugin depends on the OpenOffice.org development
+This plugin provides the support of C++ implementation for LibreOffice
+component development. This plugin depends on the LibreOffice development
 core plugin.
 
 Even if this is a important piece of work, there are still other
 features to add and bugs to correct, please do not hesitate to
-express your remarks and requests on the ooo-build at lists.freedesktop.org 
+express your remarks and requests on the LibreOffice development 
 mailing list.
    </description>
 
@@ -40,7 +40,7 @@ MA 02111-1307 USA
    </license>
 
    <url>
-      <discovery label="OpenOffice.org Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
+      <discovery label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
    </url>
 
    <requires>
diff --git a/java/build/MANIFEST.MF.in b/java/build/MANIFEST.MF.in
index 4de34bf..d6bfd41 100644
--- a/java/build/MANIFEST.MF.in
+++ b/java/build/MANIFEST.MF.in
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Java Plug-in for OOo eclipse integration
+Bundle-Name: Java Plug-in for OOEclipse
 Bundle-SymbolicName: org.openoffice.ide.eclipse.java; singleton:=true
 Bundle-Version: @VERSION@
 Bundle-Activator: org.openoffice.ide.eclipse.java.OOoJavaPlugin
-Bundle-Vendor: OpenOffice.org
+Bundle-Vendor: Cédric Bosdonnat
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.openoffice.ide.eclipse.core,
diff --git a/java/build/build.xml b/java/build/build.xml
index bb68587..b18ff7f 100644
--- a/java/build/build.xml
+++ b/java/build/build.xml
@@ -62,6 +62,7 @@
 		<property name="java.sources" value="${java.basedir}/source"/>
 		
 		<path id="java.dependencies.path">
+			<pathelement location="${packager.out.classes}"/>
 			<pathelement location="${core.out.classes}"/>
 			
 			<fileset dir="${eclipse.home}/plugins/">
diff --git a/java/build/feature.xml.in b/java/build/feature.xml.in
index 644c33e..99ea346 100644
--- a/java/build/feature.xml.in
+++ b/java/build/feature.xml.in
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.openoffice.ide.eclipse.java"
-      label="OpenOffice.org development plugin support for Java implementation"
+      label="LibreOffice development plugin support for Java implementation"
       version="@VERSION@"
       provider-name="Cédric Bosdonnat">
 
    <description>
-This plugin provides the support of Java implementation for OpenOffice.org
-component development. This plugin depends on the OpenOffice.org development
+This plugin provides the support of Java implementation for LibreOffice
+component development. This plugin depends on the LibreOffice development
 core plugin.
 
 Even if this is a important piece of work, there are still other
 features to add and bugs to correct, please do not hesitate to
-express your remarks and requests on the dev at api openoffice mailing
-list.
+express your remarks and requests on the LibreOffice development
+mailing list.
    </description>
 
    <copyright>
-      The Initial Developer of the Original Code is: Sun Microsystems,Inc..
-Copyright: 2002 by Sun Microsystems, Inc.
-All Rights Reserved.
-Contributor(s): Cedric Bosdonnat
+Copyright: 2010 by Cedric Bosdonnat
    </copyright>
 
    <license url="http://www.openoffice.org/license.html">
@@ -43,7 +40,7 @@ MA 02111-1307 USA
    </license>
 
    <url>
-      <discovery label="OpenOffice.org Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
+      <discovery label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
    </url>
 
    <requires>
diff --git a/java/build/site_fragment.xml.in b/java/build/site_fragment.xml.in
index 7e62ded..cde5cac 100644
--- a/java/build/site_fragment.xml.in
+++ b/java/build/site_fragment.xml.in
@@ -1,7 +1,7 @@
    <feature 
    		url="features/org.openoffice.ide.eclipse.java_ at VERSION@.jar" 
    		id="org.openoffice.ide.eclipse.java" version="@VERSION@">
-      <category name="OpenOffice.org"/>
+      <category name="LibreOffice"/>
    </feature>
    
    
\ No newline at end of file
commit 043b49ff333c0d07ab22dab4ec975fe51d6cee85
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Wed Nov 24 22:35:30 2010 +0100

    Added the build scripts for the packager plugin.
    
    Fetches the sources of the ooo-plugin-packager from git's HEAD.

diff --git a/packager/.classpath b/packager/.classpath
index c5d47ad..3402384 100644
--- a/packager/.classpath
+++ b/packager/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="ooo-plugin-packager-core-0.1.0-SNAPSHOT.jar" sourcepath="/ooo-plugin-packager-core/src/main/java"/>
+	<classpathentry kind="src" path="source/ooo-plugin-packager-core/src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/packager/.externalToolBuilders/Sources update.launch b/packager/.externalToolBuilders/Sources update.launch
new file mode 100644
index 0000000..465b0d9
--- /dev/null
+++ b/packager/.externalToolBuilders/Sources update.launch	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.openoffice.ide.packager.core/build/build.xml"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.openoffice.ide.packager.core"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.openoffice.ide.packager.core/build/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value=""/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.openoffice.ide.packager.core}"/>
+</launchConfiguration>
diff --git a/packager/.gitignore b/packager/.gitignore
index d392f0e..9546c6c 100644
--- a/packager/.gitignore
+++ b/packager/.gitignore
@@ -1 +1,2 @@
 *.jar
+source
diff --git a/packager/.project b/packager/.project
index b36f88f..c052e77 100644
--- a/packager/.project
+++ b/packager/.project
@@ -6,6 +6,16 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/Sources update.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
diff --git a/packager/META-INF/MANIFEST.MF b/packager/META-INF/MANIFEST.MF
index a2ebd5b..a271484 100644
--- a/packager/META-INF/MANIFEST.MF
+++ b/packager/META-INF/MANIFEST.MF
@@ -6,8 +6,5 @@ Bundle-Version: 0.1.0
 Bundle-Vendor: Cédric Bosdonnat
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: ooo-plugin-packager-core-0.1.0-SNAPSHOT.jar,
- .
 Export-Package: org.openoffice.plugin.core.model,
  org.openoffice.plugin.core.utils
-Require-Bundle: org.apache.commons.lang;bundle-version="2.3.0"
diff --git a/packager/README.txt b/packager/README.txt
new file mode 100644
index 0000000..d623302
--- /dev/null
+++ b/packager/README.txt
@@ -0,0 +1,4 @@
+This project isn't intended to contain any changed source: everything should be fetched from the
+ooo-plugin-packager Git repository. The META-INF/MANIFEST.MF file is present only for building 
+inside Eclipse and thus testing the plugins easily. Please edit the build/MANIFEST.MF.in for changes
+to be distributed in the plugin. 
\ No newline at end of file
diff --git a/packager/build.properties b/packager/build.properties
index 9abde93..b2b1ead 100644
--- a/packager/build.properties
+++ b/packager/build.properties
@@ -1,5 +1,2 @@
-source.. = src/
 output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               ooo-plugin-packager-core-0.1.0-SNAPSHOT.jar
+bin.includes = META-INF/
diff --git a/packager/build/MANIFEST.MF.in b/packager/build/MANIFEST.MF.in
index ac1cb47..69578ed 100644
--- a/packager/build/MANIFEST.MF.in
+++ b/packager/build/MANIFEST.MF.in
@@ -6,8 +6,5 @@ Bundle-Version: @VERSION@
 Bundle-Vendor: Cédric Bosdonnat
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: ooo-plugin-packager-core-0.1.0-SNAPSHOT.jar,
- .
 Export-Package: org.openoffice.plugin.core.model,
  org.openoffice.plugin.core.utils
-Require-Bundle: org.apache.commons.lang;bundle-version="2.3.0"
diff --git a/packager/build/build.properties b/packager/build/build.properties
index d99e73e..5685767 100644
--- a/packager/build/build.properties
+++ b/packager/build/build.properties
@@ -1,4 +1,4 @@
 #Wed Apr 26 20:26:48 CEST 2006
-packager.plugin.version=1.0.0
+packager.plugin.version=0.1.0
 debug=true
-packager.git.repo=git://github.com/fredericmorin/ooo-plugin-packager.git
+packager.git.repo=git://github.com/fredericmorin/ooo-plugin-packager.git
\ No newline at end of file
diff --git a/packager/build/build.xml b/packager/build/build.xml
index 2fc4fb7..ed7b28f 100644
--- a/packager/build/build.xml
+++ b/packager/build/build.xml
@@ -1,16 +1,35 @@
 <?xml version="1.0"?>
-
-<project name="packager" default="packager.error">
-
-	
-	<target name="packager.error">
-		<fail>Wrong target!
-			
-			This script should not be executed directly.
-			Please, use the one in the build project
-		</fail>
-	</target>
-	
+<!-- ======================================================================
+ *
+ * The Contents of this file are made available subject to the terms of
+ * the GNU Lesser General Public License Version 2.1
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2009 by Cédric Bosdonnat.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ * 
+ * The Initial Developer of the Original Code is: Cédric Bosdonnat.
+ *
+ * Copyright: 2009 by Cédric Bosdonnat.
+ *
+ * All Rights Reserved.
+ * 
+  ====================================================================== -->
+<project name="packager" default="update-sources"> 
 	
 	<target name="init-env">
 		<dirname property="packager.basedir" file="${ant.file.packager}/.."/>
@@ -19,22 +38,14 @@
 		
 		<property name="packager.out.path" value="${packager.basedir}/bin/ant" />
 		<property name="packager.out.classes" value="${packager.out.path}/classes"/>
-        <property name="packager.sources" value="${packager.out.path}/source"/>
-
-		<path id="packager.dependencies.path">
-			<fileset dir="${eclipse.home}/plugins/">
-				<include name="org.apache.commons.lang*.jar"/>
-			</fileset>
-        </path>
+        <property name="packager.sources" value="${packager.basedir}/source"/>
 		
 		<mkdir dir="${packager.out.path}/features" />
 		<mkdir dir="${packager.out.path}/plugins" />
         <mkdir dir="${packager.out.classes}" />
 
         <condition property="packager.sources.cloned">
-            <resourceexists>
-                  <file file="${packager.sources}"/>
-            </resourceexists>
+        	<available file="${packager.sources}"/>
         </condition>
 	</target>
 	
@@ -44,18 +55,8 @@
 		<delete dir="${packager.out.path}" />
 	</target>
 
-    <!--
-	<target name="packager.compile" depends="init-env">
-		<javac srcdir="${packager.sources}" destdir="${packager.out.classes}"
-			target="1.5" source="1.5" 
-			debug="${debug}"
-			classpathref="packager.dependencies.path" 
-			excludes="**/unittests/**"/>
-    </target>
-    -->
-
     <target name="clone-sources" depends="init-env" unless="packager.sources.cloned">
-        <exec executable="git" dir="${packager.out.path}">
+        <exec executable="git" dir="${packager.basedir}">
             <arg line="clone ${packager.git.repo}"/>
             <arg line="source"/>
         </exec>
@@ -66,27 +67,28 @@
             <arg line="pull -r"/>
         </exec>
     </target>
-
-    <target name="compile-jar" depends="init-env, clone-sources, pull-sources">
-        
+	
+	<target name="update-sources" depends="clone-sources, pull-sources" description="Update the packager sources from git"/>
+	
+    <target name="packager-compile" depends="init-env, update-sources">
+    	<javac srcdir="${packager.sources}/ooo-plugin-packager-core/src/main" destdir="${packager.out.classes}"
+				target="1.5" source="1.5" 
+				debug="${debug}"/>
     </target>
 
 
-	<target name="packager.plugin" depends="compile-jar">
+	<target name="packager.plugin" depends="packager-compile">
 		<copy file="${packager.basedir}/build/MANIFEST.MF.in"
 			tofile="${packager.out.path}/MANIFEST.MF" />
 		<replace file="${packager.out.path}/MANIFEST.MF"
 			token="@VERSION@" value="${packager.plugin.version}" />
 		
-		<jar destfile="${packager.out.path}/plugins/${package.prefix}.java_${packager.plugin.version}.jar"
+		<jar destfile="${packager.out.path}/plugins/${package.prefix}.packager.core_${packager.plugin.version}.jar"
 			manifest="${packager.out.path}/MANIFEST.MF">
-			<zipfileset prefix="" dir="${packager.sources}">
+			<zipfileset prefix="" dir="${packager.sources}/ooo-plugin-packager-core/src/main">
 				<exclude name="**/*.java"/>
 			</zipfileset>
 			<zipfileset prefix="" dir="${packager.out.classes}"/>
-			
-			<zipfileset prefix="icons" dir="${packager.basedir}/icons"/>
-			<zipfileset prefix="" file="${packager.basedir}/plugin.xml" />
 		</jar>
 	</target>
 	


More information about the ooo-build-commit mailing list