diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-04-03 22:54:32 +0200 |
|---|---|---|
| committer | Francois Tigeot <ftigeot@wolfpond.org> | 2011-04-03 22:54:32 +0200 |
| commit | 682884dc1c5fab07d1a0737f4fde8d62b25b0289 (patch) | |
| tree | 9277144910eeab990b4b6a51b8393b505d218271 /solenv/inc | |
| parent | 005a8c80450dc3def6683d1a62c75ded9b8a3784 (diff) | |
Revert "Remove jpropex, it is unused."
This reverts commit 8c2458ef96f14eb96ca011a18c98c975c332d981.
Diffstat (limited to 'solenv/inc')
| -rwxr-xr-x | solenv/inc/tg_propmerge.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/solenv/inc/tg_propmerge.mk b/solenv/inc/tg_propmerge.mk index e23b6ef12efe..796bca982815 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) > $@ |