[Libreoffice-commits] .: solenv/inc

[François Tigeot]

 solenv/inc/tg_propmerge.mk |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit d4dadd43052ae653dda13afbea0746042783b7a3
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Sun Apr 3 22:54:32 2011 +0200

    Revert "Remove jpropex, it is unused."
    
    This reverts commit 8c2458ef96f14eb96ca011a18c98c975c332d981.

diff --git a/solenv/inc/tg_propmerge.mk b/solenv/inc/tg_propmerge.mk
index e23b6ef..796bca9 100755
--- a/solenv/inc/tg_propmerge.mk
+++ b/solenv/inc/tg_propmerge.mk
@@ -50,8 +50,13 @@ $(CLASSDIR)/$(PACKAGE)/%.properties $(MERGEPHONY) : %.properties
 
 $(MISC)/$(TARGET).pmerge.mk : $(PMERGELIST)
 .IF "$(WITH_LANG)"!=""
+# jpropex command file requirements:
+# - one file per line
+# - no spaces
+# - no empty lines
 # $(uniq ...) to workaround $assign adding the value twice...
     @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
+    $(COMMAND_ECHO)$(SOLARBINDIR)/jpropex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l all -lf $(alllangiso:s/ /,/) -m $(LOCALIZESDF)
 .ENDIF          # "$(WITH_LANG)"!=""
     @-$(RM) $@
     $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@