CWS-TOOLING: integrate CWS mav46

2009-04-03 13:43:02 +0200 mav  r270481 : #i81373# fix delivering
2009-04-01 09:13:45 +0200 hjs  r270299 : #i81373# a bit too specific
2009-03-31 14:55:42 +0200 mav  r270282 : #i81373# the new tarball patching mechanics from hjs
2009-03-31 12:47:18 +0200 mav  r270274 : #i81373# use the new tarball patching mechanics
2009-03-31 12:46:35 +0200 mav  r270273 : #i81373# the change from the version attached to issue
2009-03-29 19:39:21 +0200 mav  r270191 : CWS-TOOLING: rebase CWS mav46 to trunk@270033 (milestone: DEV300:m45)
2009-02-27 09:07:23 +0100 mav  r268552 : #i99703# workaround Ubuntu problem
2009-02-25 12:51:27 +0100 mav  r268434 : #i81373# change the version of the extension
2009-02-25 11:25:15 +0100 mav  r268420 : #i81373# the filter installation needs at least 3.0 to work
2009-02-23 13:04:34 +0100 mav  r268352 : #i88682# use correct representation of CR in xml
2009-02-20 16:40:25 +0100 mav  r268334 : #i88682# show a warning if the page exists already
2009-02-20 15:42:10 +0100 mav  r268330 : #i99462# remove wiki filter from OOo installation
2009-02-20 15:39:57 +0100 mav  r268329 : #i99462# remove wiki filter from OOo installation
2009-02-20 15:36:41 +0100 mav  r268328 : #i99462# remove wiki filter from OOo installation
2009-02-20 15:33:29 +0100 mav  r268326 : #i99462# remove wiki filter from OOo installation
2009-02-20 14:19:45 +0100 mav  r268320 : #i88650# fix the typo
2009-02-20 13:02:38 +0100 mav  r268315 : #i81373# add math transformation into wiki filter
2009-02-20 11:46:20 +0100 mav  r268309 : #i81373# add the tarball
2009-02-19 09:46:10 +0100 mav  r268262 : #i82560# add wiki template into the extension
2009-02-19 07:26:45 +0100 mav  r268258 : #i82560#,#i81373# add wiki filter and template into the extension
2009-02-17 12:47:16 +0100 mav  r268115 : #i81373# commit the patch
2009-02-16 14:32:34 +0100 mav  r267814 : #i82560# rename the template
2009-02-16 14:29:40 +0100 mav  r267812 : #i82560# rename the template
2009-02-16 14:29:15 +0100 mav  r267811 : #i82560# rename the template
2009-02-16 12:16:23 +0100 mav  r267788 : #i90840# integrate the patch
2009-02-16 11:48:28 +0100 mav  r267786 : #i95568#,#i95340# improve parsing of html wiki-pages while looking for the server
2009-02-13 13:46:35 +0100 mav  r267720 : #i95568# fix typos
2009-02-13 13:38:42 +0100 mav  r267719 : #i96279# integrate the patch
2009-02-13 13:37:32 +0100 mav  r267718 : #i95568# check the retrieved URL
2009-02-13 11:39:55 +0100 mav  r267706 : #i95568# allow to connect to Wikipedia successfuly

4 files changed, 22 insertions, 36 deletions

diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index b149eb36755f..a7b58c83e72b 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -430,11 +430,6 @@ Directory gid_Dir_Share_Xslt_Docbook
     DosName = "docbook";
 End
 
-Directory gid_Dir_Share_Xslt_Wiki
-    ParentID = gid_Dir_Share_Xslt;
-    DosName = "wiki";
-End
-
 Directory gid_Dir_Share_Xslt_Common
     ParentID = gid_Dir_Share_Xslt;
     DosName = "common";
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 8df9f80c5a2e..8a4e41c54562 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -268,17 +268,3 @@ File gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcu
     Name = "/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu";
 End
 
-File gid_File_Stw_MediaWikiTemplate
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Wiki;
-    Name = "/xslt/export/wiki/oopedia-style.ott";
-End
-
-File gid_File_Xsl_MediaWiki
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Wiki;
-    Name = "/xslt/export/wiki/odt2mediawiki.xsl";
-End
-
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index b931c954bff1..c2e1d03f008b 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -75,9 +75,7 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu,
     gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu,
     gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu,
-    gid_File_Tmp_Userinstall_Wrt_Inf,
-    gid_File_Stw_MediaWikiTemplate,
-    gid_File_Xsl_MediaWiki);
+    gid_File_Tmp_Userinstall_Wrt_Inf);
 End
 
 // Module gid_Module_Prg_Wrt_Help
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 490b327f564d..8bb27edb67bc 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -50,10 +50,16 @@ LDFLAGS!:=$(EXTRA_LINKFLAGS) $(LDFLAGS)
 #override
 PACKAGE_DIR=$(MISC)$/build
 ABS_PACKAGE_DIR:=$(MAKEDIR)$/$(MISC)$/build
+
 #MUST match with PACKAGE_DIR
 BACK_PATH=..$/..$/..$/
 #MUST match with reference (currently MISC)
 MBACK_PATH=..$/..$/
+.IF "$(TARFILE_IS_FLAT)" != ""
+fake_root_dir=$/$(TARFILE_NAME)
+#MUST match fake_root_dir in directory levels
+fake_back=..$/
+.ENDIF "$(TARFILE_IS_FLAT)" != ""
 
 P_CONFIGURE_DIR=$(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$(CONFIGURE_DIR)
 P_BUILD_DIR=$(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$(BUILD_DIR)
@@ -102,9 +108,9 @@ clean:
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.bz2
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(BACK_PATH)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
+    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
 .ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
 .ENDIF			# "$(GUI)"=="UNX"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
@@ -112,43 +118,43 @@ $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.bz2
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.Z
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.Z | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
+    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.Z | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
 .ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := uncompress -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.Z | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := uncompress -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.Z | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
 .ENDIF			# "$(GUI)"=="UNX"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := gzip -d -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.gz $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.tgz
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(BACK_PATH)download$/$(TARFILE_NAME).tgz $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := gzip -d -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tgz $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar
     @-$(RM) $@
-    noop $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(BACK_PATH)download$/$(TARFILE_NAME).tar)
+    noop $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar)
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.zip
     @-$(RM) $@
-    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)download$/$(TARFILE_NAME).zip)
+    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).zip)
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)$/%.unpack : $(PRJ)$/download$/%.jar
     @-$(RM) $@
 .IF "$(OS)"=="SOLARIS"
-    noop $(assign UNPACKCMD := jar xf $(BACK_PATH)download$/$(TARFILE_NAME).jar)
+    noop $(assign UNPACKCMD := jar xf $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).jar)
 .ELSE			# "$(OS)"=="SOLARIS"
-    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)download$/$(TARFILE_NAME).jar)
+    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).jar)
 .ENDIF			# "$(OS)"=="SOLARIS"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
@@ -157,8 +163,8 @@ $(MISC)$/%.unpack : $(PRJ)$/download$/%.jar
 $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack $(PATCH_FILE_DEP)
     $(IFEXIST) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)_removeme $(FI)
     -rm -rf $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)_removeme
-    @-$(MKDIRHIER) $(PACKAGE_DIR)
-    cd $(PACKAGE_DIR) && ( $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
+    @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+    cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
     @echo make writeable...
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
@@ -300,7 +306,8 @@ $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
 $(MISC)$/$(TARFILE_ROOTDIR).done : $(MISC)$/$(TARFILE_NAME).unpack $(PATCH_FILES)
     @-mv $(MISC)$/$(TARFILE_ROOTDIR) $(MISC)$/$(TARFILE_ROOTDIR).old
     @-rm -rf $(MISC)$/$(TARFILE_ROOTDIR).old
-    cd $(MISC) && $(subst,$(BACK_PATH),..$/..$/ $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack))
+    @-$(MKDIRHIER) $(MISC)$(fake_root_dir)
+    cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack))
 .IF "$(P_ADDITIONAL_FILES)"!=""
     noop $(foreach,i,$(P_ADDITIONAL_FILES) $(shell echo dummy > $i))
 .ENDIF			 "$(P_ADDITIONAL_FILES)"!=""
@@ -318,7 +325,7 @@ $(MISC)$/$(TARFILE_ROOTDIR).done : $(MISC)$/$(TARFILE_NAME).unpack $(PATCH_FILES
 .ENDIF			# "$(my4ver:s/.//:s/,//)" >= "300"
 .ELSE           # "$(GUI)"=="WNT"
 .IF "$(BSCLIENT)"=="TRUE"
-    cd $(MISC) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)$/${(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2
+    cd $(MISC) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2
 .ELSE           # "$(BSCLIENT)"!=""
     cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2
 .ENDIF          # "$(BSCLIENT)"!=""