GNOME.org
 

ooo-build r12410 - in trunk: . bin patches/dev300

Author: rengelhard
Date: Wed Apr 30 23:42:12 2008
New Revision: 12410
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12410&view=rev

Log:
2008-04-30  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/debian-system-apache-commons.diff:
          (DebianBaseOnly) set Class-Path to the system libs and don't
          pack the apache-commons jars into the oxt
        * patches/dev300/wiki-publisher-no-license.diff: fix to build
        * bin/unpack: unpack swext-$CVSTAG.tar.gz when
          --disable-mediawiki not specified.
        * patches/dev300/apply: reenable above, move into own
          swextFixes enabled by below
        * Makefile.shared: add extra swext distro when swext directory exists


Added:
   trunk/patches/dev300/debian-system-apache-commons.diff
Modified:
   trunk/ChangeLog
   trunk/Makefile.shared
   trunk/bin/setup.in
   trunk/bin/unpack
   trunk/configure.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/wiki-publisher-no-license.diff

Modified: trunk/Makefile.shared
==============================================================================
--- trunk/Makefile.shared	(original)
+++ trunk/Makefile.shared	Wed Apr 30 23:42:12 2008
@@ -25,6 +25,9 @@
 		if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \
 			FLAGS="$$FLAGS --distro=Localize"; \
 		fi ; \
+		if test -d $(OOBUILDDIR)/swext ; then \
+			FLAGS="$$FLAGS --distro=swext"; \
+		fi ; \
 		if test -n "$(OOO_ADDITIONAL_SECTIONS)" ; then \
 			FLAGS="$$FLAGS --additional-sections=$(OOO_ADDITIONAL_SECTIONS)"; \
 		fi ; \
@@ -88,6 +91,9 @@
 	if test $(OOO_LANGS) != en-US ; then \
 		FLAGS="$$FLAGS --distro=Localize"; \
 	fi ; \
+	if test -d $(OOBUILDDIR)/swext ; then \
+		FLAGS="$$FLAGS --distro=swext"; \
+	fi ; \
 	if test -n "$(OOO_ADDITIONAL_SECTIONS)" ; then \
 		FLAGS="$$FLAGS --additional-sections=$(OOO_ADDITIONAL_SECTIONS)"; \
 	fi ; \
@@ -112,6 +118,9 @@
 	if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \
 		FLAGS="$$FLAGS --distro=Localize"; \
 	fi ; \
+	if test -d $(OOBUILDDIR)/swext ; then \
+		FLAGS="$$FLAGS --distro=swext"; \
+	fi ; \
 	if test -n "$(OOO_ADDITIONAL_SECTIONS)" ; then \
 		FLAGS="$$FLAGS --additional-sections=$(OOO_ADDITIONAL_SECTIONS)"; \
 	fi ; \

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Wed Apr 30 23:42:12 2008
@@ -115,9 +115,8 @@
 DATADIR=$OODESTDIR$DATADIRBASE
 SYSCONFBASE= sysconfdir@
 SYSCONFDIR=$OODESTDIR$SYSCONFBASE
-OOINSTBASE= libdir@/@OOOINSTALLDIRNAME@
+OOINSTBASE= libdir@
 OOINSTDIR=$OODESTDIR$OOINSTBASE
-OOOINSTALLDIRNAME= OOOINSTALLDIRNAME@
 UPSTREAM_NAME= UPSTREAM_NAME@
 MONO_GAC_ROOT= MONO_GAC_ROOT@
 
@@ -239,7 +238,7 @@
 export BUILD_FLAGS VERSION TOOLSDIR VENDORNAME
 export PREFIX PREFIXBASE SYSCONFDIR SYSCONFBASE
 export MANDIR MANDIRBASE DOCDIR DOCDIRBASE
-export OOINSTDIR OOINSTBASE OOOINSTALLDIRNAME
+export OOINSTDIR OOINSTBASE
 export OODESTDIR OOO_LANGS OOO_LANGS_LIST
 export OOO_POOR_HELP_LOCALIZATIONS
 export CONFIGURE_OPTIONS

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Wed Apr 30 23:42:12 2008
@@ -493,6 +493,12 @@
   $GNUCP -a $SRCDIR/$LIBWPG_PACKAGE $OOBUILDDIR/libwpg/download/ || exit 1
 fi
 
+if ! echo $CONFIGURE_FLAGS | grep -q disable-mediawiki; then
+  SWEXT_PACKAGE=swext-$CVSTAG.tar.gz
+  check_tarball $SRCDIR/$SWEXT_PACKAGE
+  tar xfz $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR
+fi
+
 # OxygenOffice extras
 for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
     check_tarball $SRCDIR/$pack

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Apr 30 23:42:12 2008
@@ -426,9 +426,7 @@
    GREP=grep
 fi
 
-if echo "$with_tag" | $GREP -E ['^(OOO_|oo[a-z]680-|OO[A-Z]680_)'] >/dev/null 2>/dev/null ; then
-   APPLY_DIR="$TOOLSDIR/patches/src680"
-elif echo "$with_tag" | $GREP -E ['^(src680-m2[4-9][0-9]|dev300)'] >/dev/null 2>/dev/null ; then
+if echo "$with_tag" | $GREP -E ['^(src680-m2[4-9][0-9]|dev300)'] >/dev/null 2>/dev/null ; then
    APPLY_DIR="$TOOLSDIR/patches/dev300"
 else
    APPLY_DIR="$TOOLSDIR/patches/$with_tag"

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Apr 30 23:42:12 2008
@@ -38,6 +38,10 @@
 Sdk : SdkFixes
 #Localize
 Localize : LocalizeLayout
+# patches touching swext which is not in the OpenOffice2 alias yet.
+# FIXME: Get this cleaned up
+swext : swextFixes
+
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
 	     NotDebian, Lockdown, Split, Shrink, \
@@ -328,9 +332,10 @@
 reportdesigner-no-license.diff
 presentation-minimizer-no-license.diff
 presenterscreen-no-license.diff
-#FIXME: swext not in OpenOffice2 alias#wiki-publisher-no-license.diff
 pdfimport-no-license.diff
 
+[ swextFixes ]
+wiki-publisher-no-license.diff
 
 [ Fixes ]
 # sd printing fixes
@@ -1999,6 +2004,7 @@
 
 [ DebianBaseOnly ]
 debian-system-jfreereport.diff
+debian-system-apache-commons.diff
 # FIXME: does this need more for DEV300s new external modules?
 configures-explicit-arch.diff
 

Added: trunk/patches/dev300/debian-system-apache-commons.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/debian-system-apache-commons.diff	Wed Apr 30 23:42:12 2008
@@ -0,0 +1,28 @@
+Index: mediawiki/build.xml
+===================================================================
+RCS file: /cvs/sw/swext/mediawiki/build.xml,v
+retrieving revision 1.16
+diff -u -u -r1.16 build.xml
+--- swext/mediawiki/build.xml	11 Apr 2008 10:05:02 -0000	1.16
++++ swext/mediawiki/build.xml	30 Apr 2008 19:11:48 -0000
+@@ -103,8 +103,7 @@
+     <target name="jar" depends="compile, init">
+         <jar basedir="${classes}" compress="true" jarfile="${dist}/${target}.jar">
+             <manifest>
+-		<!-- FIXME: Set Class-Path correctly for the system case !-->		
+-                <attribute name="Class-Path" value="commons-codec-1.3.jar commons-lang-2.3.jar commons-httpclient-3.1.jar commons-logging-1.1.1.jar"/>
++                <attribute name="Class-Path" value="file:///usr/share/java/commons-codec.jar file:///usr/share/java/commons-lang.jar file:///usr/share/java/commons-httpclient.jar file:///usr/share/java/commons-logging.jar"/>
+                 <attribute name="RegistrationClassName" value="com.sun.star.wiki.WikiEditorImpl"/>
+             </manifest>            
+         </jar>
+@@ -140,10 +139,6 @@
+             <fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>
+             <fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
+             <fileset dir="." includes="images/**,templates/**" casesensitive="yes"/>
+-            <file file="${commons-codec-jar}"/>
+-            <file file="${commons-httpclient-jar}"/>
+-            <file file="${commons-lang-jar}"/>
+-            <file file="${commons-logging-jar}"/>
+             <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
+             <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
+             <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>

Modified: trunk/patches/dev300/wiki-publisher-no-license.diff
==============================================================================
--- trunk/patches/dev300/wiki-publisher-no-license.diff	(original)
+++ trunk/patches/dev300/wiki-publisher-no-license.diff	Wed Apr 30 23:42:12 2008
@@ -60,3 +60,21 @@
  	<dependencies>
  		<OpenOffice.org-minimal-version value="2.4" d:name="OpenOffice.org 2.4 or StarOffice 8 Update 10"/>
  	</dependencies>
+--- swext/mediawiki/build.xml-old	2008-04-30 23:55:39.000000000 +0200
++++ swext/mediawiki/build.xml	2008-04-30 23:56:30.000000000 +0200
+@@ -141,7 +141,6 @@
+             <fileset dir="." includes="images/**,templates/**" casesensitive="yes"/>
+             <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
+             <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
+-            <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>
+             <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
+         </zip>
+     </target>
+@@ -159,7 +158,6 @@
+             <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp" casesensitive="yes" prefix="help"/>
+             <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
+             <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
+-            <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>
+             <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
+         </zip>
+     </target>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]