ooo-build r14269 - in trunk: . bin/piece patches/dev300

From: pmladek svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14269 - in trunk: . bin/piece patches/dev300
Date: Thu, 9 Oct 2008 15:56:33 +0000 (UTC)
Author: pmladek
Date: Thu Oct  9 15:56:33 2008
New Revision: 14269
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14269&view=rev

Log:
2008-10-09  Petr Mladek  <pmladek suse cz>

	* patches/dev300/piece-services.diff:
	* patches/dev300/piece-jvmfwk.diff:
	* bin/piece/post-inst-postprocess:
	* patches/dev300/apply: enable and fix java component registration;
	  FIXME: should use the solution suggested at 
	  http://www.openoffice.org/issues/show_bug.cgi?id=94759 instead of
	  the ugly hack with jvmfwk3
	* patches/dev300/piece-rsc.diff: bin obsoleted

	* patches/dev300/piece-connectivity.diff:
	* patches/dev300/piece-icons.diff:
	* patches/dev300/apply:
	* bin/piece/file-list-help: fix missing icons; it caused many crazy
	  problems

	* bin/piece/desktop-support-app: show the new start wizard rather than
	  the ugly "Documetns and Templates dialog"; so, it behaves
	  the same way like the ooffice wrapper; we cannot remove it
	  completely because of backward compatibility :-(



Added:
   trunk/patches/dev300/piece-connectivity.diff
   trunk/patches/dev300/piece-icons.diff
   trunk/patches/dev300/piece-jvmfwk.diff
Removed:
   trunk/patches/dev300/piece-rsc.diff
Modified:
   trunk/ChangeLog
   trunk/bin/piece/desktop-support-app
   trunk/bin/piece/file-list-help
   trunk/bin/piece/post-inst-postprocess
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-services.diff

Modified: trunk/bin/piece/desktop-support-app
==============================================================================
--- trunk/bin/piece/desktop-support-app	(original)
+++ trunk/bin/piece/desktop-support-app	Thu Oct  9 15:56:33 2008
@@ -75,7 +75,7 @@
 
 case "$app" in
     "fromtemplate")
-	create_wrapper "oofromtemplate" "soffice" "slot:5500" || exit 1;
+	create_wrapper "oofromtemplate" "soffice" "" || exit 1;
 	install_desktop_file template || exit 1;
 	install_icon ooo-gulls || exit 1;
 	;;

Modified: trunk/bin/piece/file-list-help
==============================================================================
--- trunk/bin/piece/file-list-help	(original)
+++ trunk/bin/piece/file-list-help	Thu Oct  9 15:56:33 2008
@@ -8,8 +8,6 @@
 # sort by lang
 $OO_TOOLSDIR/piece/sort-l10n $piece $ooo_build_tag $DESTDIR
 
-test "$OOO_BUILD_NOARCH" = 'YES' && $OO_TOOLSDIR/piece/install-l10n-helper $piece $ooo_build_tag "$DESTDIR" files-$piece-*.txt
-
 # put the rest into the common file list
 $OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
 # main_transform.xsl will be in l10n-extras
@@ -19,5 +17,12 @@
 # non-wanted mess
 remove_dir "files-$piece.txt" $OO_INSTDIR/ure
 
-# no devel package needed for helpcontent => remove in the $DESTDIR
-test -n "$DESTDIR" && rm -rf $DESTDIR$OO_SOLVERDIR
+# FIXME: is a generic solution possible?
+# remove the duplicated .zip archives
+rm -rf $DESTDIR$OO_SOLVERDIR/pck/*.zip
+
+# move the stuff to /usr/share when enabled
+if test "$OOO_BUILD_NOARCH" = 'YES' ; then
+    $OO_TOOLSDIR/piece/install-l10n-helper $piece $ooo_build_tag "$DESTDIR" files-$piece-*.txt
+    $OO_TOOLSDIR/piece/install-devel-helper $piece $ooo_build_tag
+fi

Modified: trunk/bin/piece/post-inst-postprocess
==============================================================================
--- trunk/bin/piece/post-inst-postprocess	(original)
+++ trunk/bin/piece/post-inst-postprocess	Thu Oct  9 15:56:33 2008
@@ -11,7 +11,19 @@
 export OO_BUILD_POST_PROCESS_ENABLE='NO'
 # do not remove the already created file lists
 export OO_BUILD_FILE_LISTS_ENABLE='NO'
-#
+
+# FIXME: replace the below hack with the solution suggested at
+#        http://www.openoffice.org/issues/show_bug.cgi?id=94759
+#        It obsoletes also patches/dev300/piece-jvmfwk.diff
+# crazy hack to produce working jvmfwk3rc
+cat <<EOT  >jvmfwk3rc
+[Bootstrap]
+UNO_JAVA_JFW_ENV_JREHOME=true
+UNO_JAVA_JFW_ENV_CLASSPATH=true
+UNO_JAVA_JFW_VENDOR_SETTINGS=file://$OO_INSTDIR/ure/share/misc/javavendors.xml
+EOT
+export JVMFWK_CONFIGFILE=file://`pwd`/jvmfwk3rc
+
 $OO_TOOLSDIR/piece/install-generic $piece $ooo_build_tag
 # urgh - unbelievably nasty:
 cp -a OpenOffice/gid_Starregistry_Services_Rdb_servicesrdb/*/services.rdb \

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Oct  9 15:56:33 2008
@@ -2609,7 +2609,7 @@
 piece-deliver.diff
 piece-checkdll.diff
 piece-target.diff
-piece-rsc.diff
+piece-icons.diff
 piece-startup.diff
 piece-basic.diff
 piece-svx.diff
@@ -2624,6 +2624,7 @@
 piece-offuh.diff
 piece-cppuhelper.diff
 piece-cpputools.diff
+piece-connectivity.diff
 piece-bridges.diff
 piece-stoc.diff
 piece-unoil.diff
@@ -2636,6 +2637,7 @@
 piece-ant.diff
 piece-extensions.diff
 piece-setup_native.diff
+piece-jvmfwk.diff
 piece-forms.diff
 piece-apache-commons.diff
 piece-reportbuilder.diff

Added: trunk/patches/dev300/piece-connectivity.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-connectivity.diff	Thu Oct  9 15:56:33 2008
@@ -0,0 +1,11 @@
+--- connectivity/source/drivers/hsqldb/makefile.mk.old	2008-04-10 11:21:52.000000000 +0200
++++ connectivity/source/drivers/hsqldb/makefile.mk	2008-10-08 15:52:20.000000000 +0200
+@@ -59,7 +59,7 @@ RES1FILELIST=\
+ 	$(SRS)$/$(TARGET).srs
+ 
+ RESLIB1NAME=$(TARGET)
+-RESLIB1IMAGES=$(SOLARSRC)$/$(RSCDEFIMG)$/database
++RESLIB1IMAGES=$(IMGSRC)$/$(RSCDEFIMG)$/database
+ RESLIB1SRSFILES=$(RES1FILELIST)
+ 
+ # Note that the resource file built here is currently *not* included

Added: trunk/patches/dev300/piece-icons.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-icons.diff	Thu Oct  9 15:56:33 2008
@@ -0,0 +1,366 @@
+--- solenv/inc/settings.mk.old	2008-10-08 13:41:29.000000000 +0200
++++ solenv/inc/settings.mk	2008-10-08 14:49:03.000000000 +0200
+@@ -982,6 +982,7 @@ RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) -D$(
+ RSCDEFS+=-DBUILD_SPECIAL=$(BUILD_SPECIAL)
+ .ENDIF
+ 
++IMGSRC=$(SOLARVER)
+ RSCDEFIMG*=default_images
+ 
+ RSCEXTINC=.
+--- solenv/inc/tg_rslb.mk.old	2008-10-08 13:41:29.000000000 +0200
++++ solenv/inc/tg_rslb.mk	2008-10-08 14:44:02.000000000 +0200
+@@ -62,11 +62,11 @@ $(RSC_MULTI$(TNR)) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
+     -ft=$@ \
+ 	$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
+@@ -77,11 +77,11 @@ $(RSC_MULTI$(TNR)) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(BIN)$/$(RESLIB$(TNR)NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil=$(BIN) \
+     -ft=$@ \
+ 	$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
+--- solenv/inc/_tg_rslb.mk.old	2008-10-08 13:41:29.000000000 +0200
++++ solenv/inc/_tg_rslb.mk	2008-10-08 14:42:50.000000000 +0200
+@@ -30,11 +30,11 @@ $(RSC_MULTI1) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
+     -ft=$@ \
+ 	$(RSC1HEADER) $(RESLIB1SRSFILES) \
+@@ -45,11 +45,11 @@ $(RSC_MULTI1) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(BIN)$/$(RESLIB1NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil=$(BIN) \
+     -ft=$@ \
+ 	$(RSC1HEADER) $(RESLIB1SRSFILES) \
+@@ -108,11 +108,11 @@ $(RSC_MULTI2) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
+     -ft=$@ \
+ 	$(RSC2HEADER) $(RESLIB2SRSFILES) \
+@@ -123,11 +123,11 @@ $(RSC_MULTI2) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(BIN)$/$(RESLIB2NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil=$(BIN) \
+     -ft=$@ \
+ 	$(RSC2HEADER) $(RESLIB2SRSFILES) \
+@@ -186,11 +186,11 @@ $(RSC_MULTI3) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
+     -ft=$@ \
+ 	$(RSC3HEADER) $(RESLIB3SRSFILES) \
+@@ -201,11 +201,11 @@ $(RSC_MULTI3) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(BIN)$/$(RESLIB3NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil=$(BIN) \
+     -ft=$@ \
+ 	$(RSC3HEADER) $(RESLIB3SRSFILES) \
+@@ -264,11 +264,11 @@ $(RSC_MULTI4) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
+     -ft=$@ \
+ 	$(RSC4HEADER) $(RESLIB4SRSFILES) \
+@@ -279,11 +279,11 @@ $(RSC_MULTI4) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(BIN)$/$(RESLIB4NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil=$(BIN) \
+     -ft=$@ \
+ 	$(RSC4HEADER) $(RESLIB4SRSFILES) \
+@@ -342,11 +342,11 @@ $(RSC_MULTI5) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
+     -ft=$@ \
+ 	$(RSC5HEADER) $(RESLIB5SRSFILES) \
+@@ -357,11 +357,11 @@ $(RSC_MULTI5) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(BIN)$/$(RESLIB5NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil=$(BIN) \
+     -ft=$@ \
+ 	$(RSC5HEADER) $(RESLIB5SRSFILES) \
+@@ -420,11 +420,11 @@ $(RSC_MULTI6) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
+     -ft=$@ \
+ 	$(RSC6HEADER) $(RESLIB6SRSFILES) \
+@@ -435,11 +435,11 @@ $(RSC_MULTI6) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(BIN)$/$(RESLIB6NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil=$(BIN) \
+     -ft=$@ \
+ 	$(RSC6HEADER) $(RESLIB6SRSFILES) \
+@@ -498,11 +498,11 @@ $(RSC_MULTI7) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
+     -ft=$@ \
+ 	$(RSC7HEADER) $(RESLIB7SRSFILES) \
+@@ -513,11 +513,11 @@ $(RSC_MULTI7) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(BIN)$/$(RESLIB7NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil=$(BIN) \
+     -ft=$@ \
+ 	$(RSC7HEADER) $(RESLIB7SRSFILES) \
+@@ -576,11 +576,11 @@ $(RSC_MULTI8) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
+     -ft=$@ \
+ 	$(RSC8HEADER) $(RESLIB8SRSFILES) \
+@@ -591,11 +591,11 @@ $(RSC_MULTI8) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(BIN)$/$(RESLIB8NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil=$(BIN) \
+     -ft=$@ \
+ 	$(RSC8HEADER) $(RESLIB8SRSFILES) \
+@@ -654,11 +654,11 @@ $(RSC_MULTI9) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
+     -ft=$@ \
+ 	$(RSC9HEADER) $(RESLIB9SRSFILES) \
+@@ -669,11 +669,11 @@ $(RSC_MULTI9) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(BIN)$/$(RESLIB9NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil=$(BIN) \
+     -ft=$@ \
+ 	$(RSC9HEADER) $(RESLIB9SRSFILES) \
+@@ -732,11 +732,11 @@ $(RSC_MULTI10) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
+     -ft=$@ \
+ 	$(RSC10HEADER) $(RESLIB10SRSFILES) \
+@@ -747,11 +747,11 @@ $(RSC_MULTI10) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(BIN)$/$(RESLIB10NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+     -oil=$(BIN) \
+     -ft=$@ \
+ 	$(RSC10HEADER) $(RESLIB10SRSFILES) \

Added: trunk/patches/dev300/piece-jvmfwk.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-jvmfwk.diff	Thu Oct  9 15:56:33 2008
@@ -0,0 +1,31 @@
+--- jvmfwk/source/fwkutil.hxx.old	2008-06-13 16:12:18.000000000 +0200
++++ jvmfwk/source/fwkutil.hxx	2008-10-07 22:38:51.000000000 +0200
+@@ -40,7 +40,9 @@
+ #if OSL_DEBUG_LEVEL >=2
+ #include <stdio.h>
+ #endif
+-
++#include <limits.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ namespace jfw
+ {
+@@ -56,9 +58,14 @@ rtl::OUString getLibraryLocation();
+ struct Bootstrap :
+ 	public ::rtl::StaticWithInit< const rtl::Bootstrap *, Bootstrap > {
+ 		const rtl::Bootstrap * operator () () {
+-            ::rtl::OUStringBuffer buf(256);
+-            buf.append(getLibraryLocation());
+-            buf.appendAscii(SAL_CONFIGFILE("/jvmfwk3"));
++            ::rtl::OUStringBuffer buf(PATH_MAX);
++            const char * pJVMFWK_CONFIGFILE = getenv("JVMFWK_CONFIGFILE");
++            if (pJVMFWK_CONFIGFILE && strlen(pJVMFWK_CONFIGFILE)) {
++        	buf.appendAscii(pJVMFWK_CONFIGFILE);
++            } else {
++        	buf.append(getLibraryLocation());
++        	buf.appendAscii(SAL_CONFIGFILE("/jvmfwk3"));
++            }
+             ::rtl::OUString sIni = buf.makeStringAndClear();
+             ::rtl::Bootstrap *  bootstrap = new ::rtl::Bootstrap(sIni);
+ #if OSL_DEBUG_LEVEL >=2

Modified: trunk/patches/dev300/piece-services.diff
==============================================================================
--- trunk/patches/dev300/piece-services.diff	(original)
+++ trunk/patches/dev300/piece-services.diff	Thu Oct  9 15:56:33 2008
@@ -126,14 +126,12 @@
  
          $filestring = $filestring . make_file_url($sourcepath);
  
-@@ -446,8 +447,10 @@
+@@ -446,8 +447,9 @@
  	$python_error_occured = 0;
  
  	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents($allvariableshashref, \ unocomponents, $regcompfileref, $servicesfile, $nativeservicesurlprefix); }
--	if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents($allvariableshashref, \ javacomponents, $regcompfileref, $servicesfile, $regcomprdb, $javaservicesurlprefix); }
+ 	if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents($allvariableshashref, \ javacomponents, $regcompfileref, $servicesfile, $regcomprdb, $javaservicesurlprefix); }
 -	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\ pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
-+#	if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents($allvariableshashref, \ javacomponents, $regcompfileref, $servicesfile, $regcomprdb, $javaservicesurlprefix); }
-+	print STDERR "Skip java component registration\n";
 +#	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\ pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
 +	print STDERR "Skip python component registration\n";
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]