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/08/05 17:04:19 UTC
svn commit: r1510529 - in /openoffice/branches/l10n40/main:
basctl/prj/build.lst basic/prj/build.lst languages/source/missing_modules
solenv/inc/rules.mk solenv/inc/target.mk
Author: jani
Date: Mon Aug 5 15:04:18 2013
New Revision: 1510529
URL: http://svn.apache.org/r1510529
Log:
basic and basctl runs with --genPO
Modified:
openoffice/branches/l10n40/main/basctl/prj/build.lst
openoffice/branches/l10n40/main/basic/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/basctl/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/basctl/prj/build.lst?rev=1510529&r1=1510528&r2=1510529&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/basctl/prj/build.lst (original)
+++ openoffice/branches/l10n40/main/basctl/prj/build.lst Mon Aug 5 15:04:18 2013
@@ -1,5 +1,6 @@
bc basctl : LIBXSLT:libxslt languages svx NULL
bc basctl usr1 - all bc_mkout NULL
+bc basctl\source nmake - all bc_source NULL
bc basctl\inc nmake - all bc_inc NULL
bc basctl\source\inc get - all bc_sinc NULL
bc basctl\sdi nmake - all bc_sdi NULL
Modified: openoffice/branches/l10n40/main/basic/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/basic/prj/build.lst?rev=1510529&r1=1510528&r2=1510529&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/basic/prj/build.lst (original)
+++ openoffice/branches/l10n40/main/basic/prj/build.lst Mon Aug 5 15:04:18 2013
@@ -1,5 +1,6 @@
sb basic : languages offuh oovbaapi svtools xmlscript framework salhelper LIBXSLT:libxslt NULL
sb basic usr1 - all sb_mkout NULL
+sb basic\source nmake - all sb_source NULL
sb basic\inc nmake - all sb_inc NULL
sb basic\source\basmgr nmake - all sb_mgr sb_inc NULL
sb basic\source\classes nmake - all sb_class sb_inc NULL
Modified: openoffice/branches/l10n40/main/languages/source/missing_modules
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/missing_modules?rev=1510529&r1=1510528&r2=1510529&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/missing_modules (original)
+++ openoffice/branches/l10n40/main/languages/source/missing_modules Mon Aug 5 15:04:18 2013
@@ -1,8 +1,8 @@
***** MODULES NOT INTEGRATED WITH genLang ****
accessibility transex3
-avmedia EXTRACT ? transex3
-basctl EXTRACT ? transex3
-basic EXTRACT ? transex3
+avmedia ? transex3
+basctl ? transex3
+basic ? transex3
chart2 EXTRACT ? transex3
connectivity EXTRACT ? transex3, cfgex
crashrep EXTRACT ?
Modified: openoffice/branches/l10n40/main/solenv/inc/rules.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/rules.mk?rev=1510529&r1=1510528&r2=1510529&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/rules.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/rules.mk Mon Aug 5 15:04:18 2013
@@ -24,6 +24,7 @@
MKFILENAME:=RULES.MK
$(OBJ)/%.obj : %.cxx
+ @echo "jan var her"
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
Modified: openoffice/branches/l10n40/main/solenv/inc/target.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/target.mk?rev=1510529&r1=1510528&r2=1510529&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/target.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/target.mk Mon Aug 5 15:04:18 2013
@@ -1565,6 +1565,7 @@ $(MISC)/$(TARGET)_%.done : %.xrb
# - SHL -
# -------
+.IF "$(MAKETARGETS)"!="genPO"
.IF "$(SHL1TARGETN)$(SHL2TARGETN)$(SHL3TARGETN)$(SHL4TARGETN)$(SHL5TARGETN)$(SHL6TARGETN)$(SHL7TARGETN)$(SHL8TARGETN)$(SHL9TARGETN)"!=""
.INCLUDE : _tg_shl.mk
.ENDIF # "$(SHL1TARGETN)$(SHL2TARGETN)$(SHL3TARGETN)$(SHL4TARGETN)$(SHL5TARGETN)$(SHL6TARGETN)$(SHL7TARGETN)$(SHL8TARGETN)$(SHL9TARGETN)"!=""
@@ -1572,6 +1573,7 @@ $(MISC)/$(TARGET)_%.done : %.xrb
.IF "$(USE_VERSIONH)"!=""
.INIT .SEQUENTIAL : $(USE_VERSIONH) $(NULLPRQ)
.ENDIF # "$(USE_VERSIONH)"!=""
+.ENDIF
# -------
# - APP -
@@ -1624,7 +1626,8 @@ $(MISC)/$(TARGET)_%.done : %.xrb
.IF "$(DEPFILES)" != ""
.INCLUDE : $(DEPFILES)
.ENDIF # "$(DEPFILES)" != ""
-.IF "$(nodep)"==""
+
+.IF "$(nodep)"=="" && "$(MAKETARGETS)"!="genPO"
.IF "$(DEPCOLLECT_SLO)" != ""
.PHONY : $(DEPCOLLECT_SLO)
.INCLUDE .IGNORE : $(DEPCOLLECT_SLO)