Author: jani
Date: Mon Aug 5 13:04:02 2013
New Revision: 1510466
URL: http://svn.apache.org/r1510466
Log:
integrated extract target (genPO) in accessibility for test, and enhanced
target/rules
Added:
openoffice/branches/l10n40/main/accessibility/source/makefile.mk
Modified:
openoffice/branches/l10n40/main/accessibility/prj/build.lst
openoffice/branches/l10n40/main/languages/source/missing_modules
openoffice/branches/l10n40/main/solenv/inc/rules.mk
openoffice/branches/l10n40/main/solenv/inc/target.mk
Modified: openoffice/branches/l10n40/main/accessibility/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/accessibility/prj/build.lst?rev=1510466&r1=1510465&r2=1510466&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/accessibility/prj/build.lst (original)
+++ openoffice/branches/l10n40/main/accessibility/prj/build.lst Mon Aug 5
13:04:02 2013
@@ -1,10 +1,11 @@
ac accessibility : languages tools jurt offuh unoil vcl javaunohelper
jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
ac accessibility usr1 -
all ac_mkout NULL
-ac accessibility\inc nmake -
all ac_inc NULL
+ac accessibility\source nmake -
all ac_source NULL
+ac accessibility\inc nmake -
all ac_inc ac_source NULL
ac accessibility\bridge\org\openoffice\java\accessibility nmake -
w ac_ooja ac_inc NULL
ac accessibility\bridge\org\openoffice\accessibility nmake -
w ac_ooa ac_ooja.w ac_inc NULL
ac accessibility\bridge\source\java nmake -
w ac_ooan ac_ooa.w ac_inc NULL
-ac accessibility\inc get - all
ac_inc NULL
+ac accessibility\inc get - all
ac_inc ac_source NULL
ac accessibility\source\helper nmake - all
ac_helper ac_inc NULL
ac accessibility\source\standard nmake - all
ac_standard ac_helper ac_inc NULL
ac accessibility\source\extended nmake - all
ac_extended ac_inc NULL
Added: openoffice/branches/l10n40/main/accessibility/source/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/accessibility/source/makefile.mk?rev=1510466&view=auto
==============================================================================
--- openoffice/branches/l10n40/main/accessibility/source/makefile.mk (added)
+++ openoffice/branches/l10n40/main/accessibility/source/makefile.mk Mon Aug 5
13:04:02 2013
@@ -0,0 +1,30 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+PRJ=..
+PRJNAME=accessibility
+TARGET=helper
+
+LANGUAGE_FILELIST="helper/accessiblestrings.src,helper/accessiblestrings.src"
+
+.INCLUDE : settings.mk
+
+.INCLUDE : target.mk
Modified: openoffice/branches/l10n40/main/languages/source/missing_modules
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/missing_modules?rev=1510466&r1=1510465&r2=1510466&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/missing_modules (original)
+++ openoffice/branches/l10n40/main/languages/source/missing_modules Mon Aug 5
13:04:02 2013
@@ -1,51 +1,51 @@
***** MODULES NOT INTEGRATED WITH genLang ****
accessibility transex3
-avmedia ? transex3
-basctl ? transex3
-basic ? transex3
-chart2 ? transex3
-connectivity ? transex3, cfgex
-crashrep ?
-cui ?NO lang dep?
-dbaccess ? transex3
-desktop ?*ONLY CMD libhelplinker.so*? transex3
-editeng ? transex3
-extensions ?
-filter ?*cfgex, FCFGMerge.jar*? transex3, cfgex
-forms ? transex3, cfgex
-formula ?NO lang dep? transex3
-fpicker transex3
-framework ?*cfgex*? transex3
-helpcontent2 ?*extras, helpex HelpLinker*? helpex
-instsetoo_native ?"libhelplinker.so*? ?no files selected?
-javainstaller2 ?
-mysqlc ?NO lang dep?
-officecfg cfgex
-padmin ?NO lang dep? transex3
-postprocess ?*cfgex, transex3, libX40HelpLinker.so"?
-readlicense_oo xrmex
-reportbuilder ?NO lang dep?
-reportdesign ?
-sc ? transex3
-scaddins ? transex3
-sccomp transex3
-scp2 ulfex
-sd ?
-sdext cfgex
-setup_native ?*ONLY MAC ulfex*?
-sfx2 ? transex3
-shell ?*ONLY WIN ulfex*?
-starmath ? transex3
-svl transex3
-svtools transex3
-svx ? transex3
-sw ? transex3
-swext ?
-sysui ulfex
-uui transex3
-vcl transex3
-wizards transex3
-xmlhelp ?*ONLY CMD compilehelp.hxx*?
-xmlsecurity ? transex3
+avmedia EXTRACT ? transex3
+basctl EXTRACT ? transex3
+basic EXTRACT ? transex3
+chart2 EXTRACT ? transex3
+connectivity EXTRACT ? transex3, cfgex
+crashrep EXTRACT ?
+cui EXTRACT ?NO lang dep?
+dbaccess EXTRACT ? transex3
+desktop EXTRACT ?*ONLY CMD libhelplinker.so*? transex3
+editeng EXTRACT ? transex3
+extensions EXTRACT ?
+filter EXTRACT ?*cfgex, FCFGMerge.jar*? transex3, cfgex
+forms EXTRACT ? transex3, cfgex
+formula EXTRACT ?NO lang dep? transex3
+fpicker EXTRACT transex3
+framework EXTRACT ?*cfgex*? transex3
+helpcontent2 EXTRACT ?*extras, helpex HelpLinker*? helpex
+instsetoo_native EXTRACT ?"libhelplinker.so*? ?no files selected?
+javainstaller2 EXTRACT ?
+mysqlc EXTRACT ?NO lang dep?
+officecfg EXTRACT cfgex
+padmin EXTRACT ?NO lang dep? transex3
+postprocess EXTRACT ?*cfgex, transex3, libX40HelpLinker.so"?
+readlicense_oo EXTRACT xrmex
+reportbuilder EXTRACT ?NO lang dep?
+reportdesign EXTRACT ?
+sc EXTRACT ? transex3
+scaddins EXTRACT ? transex3
+sccomp EXTRACT transex3
+scp2 EXTRACT ulfex
+sd EXTRACT ?
+sdext EXTRACT cfgex
+setup_native EXTRACT ?*ONLY MAC ulfex*?
+sfx2 EXTRACT ? transex3
+shell EXTRACT ?*ONLY WIN ulfex*?
+starmath EXTRACT ? transex3
+svl EXTRACT transex3
+svtools EXTRACT transex3
+svx EXTRACT ? transex3
+sw EXTRACT ? transex3
+swext EXTRACT ?
+sysui EXTRACT ulfex
+uui EXTRACT transex3
+vcl EXTRACT transex3
+wizards EXTRACT transex3
+xmlhelp EXTRACT ?*ONLY CMD compilehelp.hxx*?
+xmlsecurity EXTRACT ? transex3
languages/l10ntools
Modified: openoffice/branches/l10n40/main/solenv/inc/rules.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/rules.mk?rev=1510466&r1=1510465&r2=1510466&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/rules.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/rules.mk Mon Aug 5 13:04:02 2013
@@ -562,10 +562,12 @@ $(MISC)/%.dprc :
$(MISC)/%.dpr :
@@noop
.IF "$(nodep)"==""
+.IF "$(MAKETARGETS)"!="genPO"
@echo "Making: " $(@:f)
@@-$(RM) $@
$(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS)
make_srs_deps=true $(DEPSRSFILES)
$(COMMAND_ECHO)-$(TYPE) $(MISC)/$(TARGET).*.dprr >> $@
+.ENDIF
.ENDIF # "$(nodep)"==""
$(MISC)/%.dpz :
@@ -582,7 +584,9 @@ $(MISC)/%.dpz :
# Dependencies fuer java - Files
$(MISC)/%.dpj :
- @echo "Making: " $(@:f)
+ @noop
+.IF "$(MAKETARGETS)"!="genPO"
+ @echo "jAN Making: " $(@:f)
.IF "$(nodep)"!=""
.IF "$(GUI)"=="UNX"
@echo > $@
@@ -597,6 +601,7 @@ $(MISC)/%.dpj :
@echo $(shell @$(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR)
$(foreach,i,$(JAVADEPINCLUDES:s/;/ /) -i $i) $(JAVACLASSFILES)))
.ENDIF
.ENDIF # "$(nodep)"==""
+.ENDIF
$(SLO)/%.obj : %.asm
@echo $(COMPILE_ECHO_SWITCH) Compiling:
$(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
Modified: openoffice/branches/l10n40/main/solenv/inc/target.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/target.mk?rev=1510466&r1=1510465&r2=1510466&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/target.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/target.mk Mon Aug 5 13:04:02
2013
@@ -1345,7 +1345,7 @@ $(HXXCOPYTARGET): $(HXXCOPYFILES)
.IF "$(UNIXTEXT)"!=""
$(UNIXTEXT) : $(UNIXTEXT:f)
- @echo "Making: " $@
+ @echo "XX1 Making: " $@
@@-$(RM) -f $@
@tr -d "\015" < $(@:f) > $@
@@ -1640,7 +1640,7 @@ $(MISC)/$(TARGET)_%.done : %.xrb
.ELSE # MAKEFILERC
.ENDIF # MAKEFILERC
-.IF "$(make_srs_deps)"==""
+.IF "$(make_srs_deps)"=="" && "$(MAKETARGETS)"!="genPO"
.IF "$(SRCFILES)" != "" || "$(SRC1FILES)" != "" || "$(SRC2FILES)" != ""
.IF "$(nodep)"==""
.INCLUDE : $(MISC)/$(TARGET).dpr
@@ -1991,7 +1991,7 @@ UNOUCRDEPxxx : $(UNOUCRDEP);
##new hid.lst trigger with GEN_HID2=TRUE
#$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
-# @echo "Making: " $@
+# @echo "xx2 Making: " $@
# @echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp
# $(COMMAND_ECHO)$(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" |
$(SORT) -u >> $@.$(ROUT).tmp
# @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
@@ -2082,3 +2082,12 @@ $(SUBDIRS) .PHONY :
# if the previous block was a rule or a target, "\#" isn't recognized
# as an escaped "#". if it was an assignment, escaping works...
some_unique_variable_name:=1
+
+genPO:
+.IF "$(LANGUAGE_FILELIST)" != ""
+ @echo "extraction from $(LANGUAGE_FILELIST)"
+.ELSE
+ @echo "No language files to extract"
+.ENDIF
+
+
