You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/10/03 16:53:58 UTC

svn commit: r1528901 - in /openoffice/branches/l10n40/main: solenv/inc/rules.mk sysui/util/checksize.pl

Author: jani
Date: Thu Oct  3 14:53:58 2013
New Revision: 1528901

URL: http://svn.apache.org/r1528901
Log:
replaced ulxex (.ulf files) with genLang for merge

Modified:
    openoffice/branches/l10n40/main/solenv/inc/rules.mk
    openoffice/branches/l10n40/main/sysui/util/checksize.pl

Modified: openoffice/branches/l10n40/main/solenv/inc/rules.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/rules.mk?rev=1528901&r1=1528900&r2=1528901&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/rules.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/rules.mk Thu Oct  3 14:53:58 2013
@@ -693,10 +693,8 @@ $(MISC)/%.sh : %.sh
 $(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
 	@echo "Making: (.ulf)   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-	$(COMMAND_ECHO)$(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $<
+
 
 $(COMMONMISC)/$(TARGET)/%.xrb : %.xrb
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)

Modified: openoffice/branches/l10n40/main/sysui/util/checksize.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sysui/util/checksize.pl?rev=1528901&r1=1528900&r2=1528901&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sysui/util/checksize.pl (original)
+++ openoffice/branches/l10n40/main/sysui/util/checksize.pl Thu Oct  3 14:53:58 2013
@@ -76,7 +76,7 @@ sub check       #04.02.2005 13:40
     print "$path$file\n" if ((-e "$path$file") && $is_debug);
     # don't check dpc,flag,rpmflag,sdf [obj for UNX] files, or etc subdirectory
     return if ( ($file =~ /.+\.(dpc|\w*?flag)/) || ($file =~ /.+\.obj/ && $ENV{GUI} eq 'UNX') || ($path =~ /.+etc/) || ($path =~ /.+logs/) || ($path =~ /.+sdf/) );
-    if ( -z "$path$file" ) {
+    if ( -z "$path$file" && "$file" != "localize.sdf") {
         print "Error: $path$file 0 Bytes!\n";
         $err++;
     }