openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1514846 - in /openoffice/branches/l10n40/main: languages/source/ sal/cppunittester/ sal/qa/ByteSequence/ sal/qa/OStringBuffer/ sal/qa/osl/mutex/ sal/qa/osl/pipe/ sal/qa/osl/profile/ sal/qa/osl/setthreadname/ sal/qa/rtl/math/ setup_native/p...
Date Fri, 16 Aug 2013 18:53:48 GMT
Author: jani
Date: Fri Aug 16 18:53:48 2013
New Revision: 1514846

URL: http://svn.apache.org/r1514846
Log:
updated target.mk to care another genLang variant
and added multiple makefiles.mk for genPO

Added:
    openoffice/branches/l10n40/main/setup_native/source/makefile.mk
Modified:
    openoffice/branches/l10n40/main/languages/source/makefile.mk
    openoffice/branches/l10n40/main/sal/cppunittester/makefile.mk
    openoffice/branches/l10n40/main/sal/qa/ByteSequence/makefile.mk
    openoffice/branches/l10n40/main/sal/qa/OStringBuffer/makefile.mk
    openoffice/branches/l10n40/main/sal/qa/osl/mutex/makefile.mk
    openoffice/branches/l10n40/main/sal/qa/osl/pipe/makefile.mk
    openoffice/branches/l10n40/main/sal/qa/osl/profile/makefile.mk
    openoffice/branches/l10n40/main/sal/qa/osl/setthreadname/makefile.mk
    openoffice/branches/l10n40/main/sal/qa/rtl/math/makefile.mk
    openoffice/branches/l10n40/main/setup_native/prj/build.lst
    openoffice/branches/l10n40/main/solenv/inc/target.mk
    openoffice/branches/l10n40/main/stlport/makefile.mk

Modified: openoffice/branches/l10n40/main/languages/source/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/makefile.mk?rev=1514846&r1=1514845&r2=1514846&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/makefile.mk (original)
+++ openoffice/branches/l10n40/main/languages/source/makefile.mk Fri Aug 16 18:53:48 2013
@@ -86,3 +86,5 @@ TARGET=languages_merge
 #	$(PERL) $(SOLARVER)/$(INPATH)/bin$(UPDMINOREXT)/fast_merge.pl -sdf_files $(mktmp $<)
-merge_dir $(COMMONMISC)/sdf && $(TOUCH) $@
 #    $(COPY) $(PRJ)/localization_present.mk $(PRJ)/$(COMMON_OUTDIR)$(PROEXT)/inc
 #.ENDIF
+
+.INCLUDE : target.mk

Modified: openoffice/branches/l10n40/main/sal/cppunittester/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/cppunittester/makefile.mk?rev=1514846&r1=1514845&r2=1514846&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/cppunittester/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/cppunittester/makefile.mk Fri Aug 16 18:53:48 2013
@@ -32,6 +32,7 @@ ENABLE_EXCEPTIONS = TRUE
 .IF "$(WITH_CPPUNIT)" != "YES"
 all:
 	@echo cppunit disabled. nothing to do.
+.INCLUDE: target.mk
 
 .ELSE
 

Modified: openoffice/branches/l10n40/main/sal/qa/ByteSequence/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/ByteSequence/makefile.mk?rev=1514846&r1=1514845&r2=1514846&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/ByteSequence/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/ByteSequence/makefile.mk Fri Aug 16 18:53:48 2013
@@ -22,7 +22,7 @@
 
 
 .IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
+.INCLUDE: target.mk
 .ELSE
 
 PRJ = ../..

Modified: openoffice/branches/l10n40/main/sal/qa/OStringBuffer/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/OStringBuffer/makefile.mk?rev=1514846&r1=1514845&r2=1514846&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/OStringBuffer/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/OStringBuffer/makefile.mk Fri Aug 16 18:53:48 2013
@@ -22,7 +22,7 @@
 
 
 .IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
+.INCLUDE :  target.mk
 .ELSE
 
 PRJ=..$/..

Modified: openoffice/branches/l10n40/main/sal/qa/osl/mutex/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/osl/mutex/makefile.mk?rev=1514846&r1=1514845&r2=1514846&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/osl/mutex/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/osl/mutex/makefile.mk Fri Aug 16 18:53:48 2013
@@ -22,7 +22,7 @@
 
 
 .IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
+.INCLUDE :  target.mk
 .ELSE
 
 PRJ=..$/..$/..

Modified: openoffice/branches/l10n40/main/sal/qa/osl/pipe/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/osl/pipe/makefile.mk?rev=1514846&r1=1514845&r2=1514846&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/osl/pipe/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/osl/pipe/makefile.mk Fri Aug 16 18:53:48 2013
@@ -22,7 +22,7 @@
 
 
 .IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
+.INCLUDE :  target.mk
 .ELSE
 
 PRJ=..$/..$/..

Modified: openoffice/branches/l10n40/main/sal/qa/osl/profile/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/osl/profile/makefile.mk?rev=1514846&r1=1514845&r2=1514846&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/osl/profile/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/osl/profile/makefile.mk Fri Aug 16 18:53:48 2013
@@ -22,7 +22,7 @@
 
 
 .IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
+.INCLUDE :  target.mk
 .ELSE
 
 PRJ=..$/..$/..

Modified: openoffice/branches/l10n40/main/sal/qa/osl/setthreadname/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/osl/setthreadname/makefile.mk?rev=1514846&r1=1514845&r2=1514846&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/osl/setthreadname/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/osl/setthreadname/makefile.mk Fri Aug 16 18:53:48
2013
@@ -22,7 +22,7 @@
 
 
 .IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
+.INCLUDE: target.mk
 .ELSE
 
 PRJ = ..$/..$/..

Modified: openoffice/branches/l10n40/main/sal/qa/rtl/math/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/rtl/math/makefile.mk?rev=1514846&r1=1514845&r2=1514846&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/rtl/math/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/rtl/math/makefile.mk Fri Aug 16 18:53:48 2013
@@ -22,7 +22,7 @@
 
 
 .IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
+.INCLUDE: target.mk
 .ELSE
 
 PRJ = ../../..

Modified: openoffice/branches/l10n40/main/setup_native/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/setup_native/prj/build.lst?rev=1514846&r1=1514845&r2=1514846&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/setup_native/prj/build.lst (original)
+++ openoffice/branches/l10n40/main/setup_native/prj/build.lst Fri Aug 16 18:53:48 2013
@@ -1,5 +1,6 @@
 pk	setup_native	:	languages soltools sal xml2cmp NULL
 pk  setup_native                                          usr1    - all  sn_mkout NULL
+pk  setup_native\source                                   nmake   -  u   sn_src NULL
 pk  setup_native\scripts\source                           nmake   -  u   sn_source NULL
 pk  setup_native\scripts                                  nmake   -  u   sn_scripts sn_source.u
NULL
 pk  setup_native\source\mac                               nmake   -  u   sn_mac NULL

Added: openoffice/branches/l10n40/main/setup_native/source/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/setup_native/source/makefile.mk?rev=1514846&view=auto
==============================================================================
--- openoffice/branches/l10n40/main/setup_native/source/makefile.mk (added)
+++ openoffice/branches/l10n40/main/setup_native/source/makefile.mk Fri Aug 16 18:53:48 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=setup_native
+TARGET=helper
+
+LANGUAGE_FILELIST="mac/macinstall.ulf"
+
+.INCLUDE :	settings.mk
+
+.INCLUDE :	target.mk

Modified: openoffice/branches/l10n40/main/solenv/inc/target.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/target.mk?rev=1514846&r1=1514845&r2=1514846&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/target.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/target.mk Fri Aug 16 18:53:48 2013
@@ -2013,7 +2013,9 @@ UNOUCRDEPxxx : $(UNOUCRDEP);
 .ENDIF			# "$(JAVACLASSFILES:s/DEFINED//)$(javauno)"!=""
 .ENDIF          # "$(SOLAR_JAVA)"!=""
 
+.IF "$(MAKETARGETS)"!="genPO"
 .INCLUDE : tg_merge.mk
+.ENDIF
 .INCLUDE : tg_propmerge.mk
 .INCLUDE : tg_xmerge.mk
 

Modified: openoffice/branches/l10n40/main/stlport/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/stlport/makefile.mk?rev=1514846&r1=1514845&r2=1514846&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/stlport/makefile.mk (original)
+++ openoffice/branches/l10n40/main/stlport/makefile.mk Fri Aug 16 18:53:48 2013
@@ -54,6 +54,7 @@ $(INCCOM)$/stlport$/vector: systemstl$/$
     $(COPY) $< $@
 .ENDIF #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
 
+.INCLUDE :	target.mk
 .ELSE # "$(USE_SYSTEM_STL)"
 
 # --- Files --------------------------------------------------------



Mime
View raw message