#i25034,100000#: change tmpfile mechanism

2 files changed, 35 insertions, 11 deletions

diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk
index 99c898ed9e4b..044535bfa1bf 100644
--- a/filter/source/config/fragments/makefile.mk
+++ b/filter/source/config/fragments/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Date: 2004-01-28 15:30:42 $
+#   last change: $Date: 2004-02-05 10:45:20 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -132,16 +132,34 @@ ALLTAR: $(REALFILTERPACKAGES) $(INTERNALFILTERPACKAGES)
 $(REALFILTERPACKAGES) : $$(ALL_4$$(@:b))
      +@echo -------------------------------------------------------------------
      +@echo Building package $@
-     +@$(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar fragmentsdir=. tempdir=$(TEMP) outdir=$(MISC) pkg=$(@:b)_types   xmlpackage=Types  tcfg=$(mktmp items=$(TYPES_4$(@:b):b:t",":s/.xcu/))
-     +@$(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar fragmentsdir=. tempdir=$(TEMP) outdir=$(MISC) pkg=$(@:b)_filters xmlpackage=Filter fcfg=$(mktmp items=$(FILTERS_4$(@:b):b:t",":s/.xcu/))
-     +@$(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar fragmentsdir=. tempdir=$(TEMP) outdir=$(MISC) pkg=$(@:b)_others  xmlpackage=Misc   lcfg=$(mktmp items=$(FRAMELOADERS_4$(@:b):b:t",":s/.xcu/)) ccfg=$(mktmp items=$(CONTENTHANDLERS_4$(@:b):b:t",":s/.xcu/))
-     +@zip -j $@ $(MISC)$/$(@:b)_*.xcu
+     +@$(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar fragmentsdir=. tempdir=$(TEMP) outdir=$(MISC) pkg=$(MISC)$/$(@:b)_types.xcu   xmlpackage=Types  tcfg=$(mktmp items=$(TYPES_4$(@:b):b:t",":s/.xcu/))
+     +@$(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar fragmentsdir=. tempdir=$(TEMP) outdir=$(MISC) pkg=$(MISC)$/$(@:b)_filters.xcu xmlpackage=Filter fcfg=$(mktmp items=$(FILTERS_4$(@:b):b:t",":s/.xcu/))
+     +@$(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar fragmentsdir=. tempdir=$(TEMP) outdir=$(MISC) pkg=$(MISC)$/$(@:b)_others.xcu  xmlpackage=Misc   lcfg=$(mktmp items=$(FRAMELOADERS_4$(@:b):b:t",":s/.xcu/)) ccfg=$(mktmp items=$(CONTENTHANDLERS_4$(@:b):b:t",":s/.xcu/))
+     +-@$(RM) $(BIN)$/$(@:b)_$(INPATH).zip
+     +@zip -j $(BIN)$/$(@:b)_$(INPATH).zip $(MISC)$/$(@:b)_*.xcu
      +@$(RM) $(MISC)$/$(@:b)_*.xcu
+     +-@$(RM) $@
+     +@$(RENAME) $(BIN)$/$(@:b)_$(INPATH).zip $@
 
 $(INTERNALFILTERPACKAGES) : $$(ALL_4$$(@:b))
      +@echo -------------------------------------------------------------------
      +@echo Building special packages $@
-     +@$(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar fragmentsdir=. tempdir=$(TEMP) outdir=$(MISC) pkg=$(@:b)_types   xmlpackage=Types  tcfg=$(mktmp items=$(TYPES_4$(@:b):b:t",":s/.xcu/))
-     +@$(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar fragmentsdir=. tempdir=$(TEMP) outdir=$(MISC) pkg=$(@:b)_filters xmlpackage=GraphicFilter fcfg=$(mktmp items=$(FILTERS_4$(@:b):b:t",":s/.xcu/)) subdir_filters=internalgraphicfilters
-     +@zip -j $(BIN)$/$(@:b).zip $(MISC)$/$(@:b)_*.xcu
+     +@$(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar fragmentsdir=. tempdir=$(TEMP) outdir=$(MISC) pkg=$(MISC)$/$(@:b)_types.xcu   xmlpackage=Types  tcfg=$(mktmp items=$(TYPES_4$(@:b):b:t",":s/.xcu/))
+     +@$(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar fragmentsdir=. tempdir=$(TEMP) outdir=$(MISC) pkg=$(MISC)$/$(@:b)_filters.xcu xmlpackage=GraphicFilter fcfg=$(mktmp items=$(FILTERS_4$(@:b):b:t",":s/.xcu/)) subdir_filters=internalgraphicfilters
+     +-@$(RM) $(BIN)$/$(@:b)_$(INPATH).zip
+     +@zip -j $(BIN)$/$(@:b)_$(INPATH).zip $(MISC)$/$(@:b)_*.xcu
      +@$(RM) $(MISC)$/$(@:b)_*.xcu
+     +-@$(RM) $@
+     +@$(RENAME) $(BIN)$/$(@:b)_$(INPATH).zip $@
+
+# -----------------------------------------------------------------------------
+# TODO move files to the common tree ... 
+#      but dont forget to patch targets and scp module!
+# -----------------------------------------------------------------------------
+#    +@$(RM) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(@:b)_$(INPATH).zip
+#    +@zip -j $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(@:b)_$(INPATH).zip $(MISC)$/$(@:b)_*.xcu
+#    +@$(RM) $(MISC)$/$(@:b)_*.xcu
+#    +@$(RM) $@
+#    +@$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(@:b)_$(INPATH).zip $@
+#    +@$(RM) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(@:b)_$(INPATH).zip
+     
diff --git a/filter/source/config/tools/merge/Merger.java b/filter/source/config/tools/merge/Merger.java
index 1239cce429ef..e7472456aa4c 100644
--- a/filter/source/config/tools/merge/Merger.java
+++ b/filter/source/config/tools/merge/Merger.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Merger.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2004-01-28 18:57:22 $
+ *  last change: $Author: hr $ $Date: 2004-02-05 10:47:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -296,6 +296,11 @@ public class Merger
         }
         m_aLog.setGlobalInfo("package contains "+nItemCount+" items");
 
+        java.io.File aPackage = new File(sPackage);
+        m_aLog.setGlobalInfo("write temp package \""+aPackage.getPath()); // TODO encoding must be readed from the configuration
+        FileHelper.writeTextToFile(aPackage, false, "UTF-8", sBuffer.toString()); // check for success is done inside this method!
+
+/*
         java.lang.String sExtPkg      = m_aCfg.getString(PROP_EXTENSION_XCU);
         java.io.File     aTempPackage = FileHelper.createUniqueFile(m_aTempDir, sPackage, sExtPkg);
         java.io.File     aPackage     = new java.io.File(m_aOutDir, sPackage+"."+sExtPkg);
@@ -312,6 +317,7 @@ public class Merger
         if (bExists)
             throw new java.io.IOException("Old package \""+aPackage.getPath()+"\" couldn't be removed.");
         FileHelper.atomicFileCopy(aTempPackage, aPackage);
+*/
     }
 
     //-------------------------------------------