incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject svn commit: r1166306 - in /incubator/ooo/trunk: extras/Repository.mk extras/l10n/Repository.mk main/set_soenv.in main/solenv/gbuild/AllLangResTarget.mk main/solenv/inc/settings.mk
Date Wed, 07 Sep 2011 18:31:51 GMT
Author: erack
Date: Wed Sep  7 18:31:50 2011
New Revision: 1166306

URL: http://svn.apache.org/viewvc?rev=1166306&view=rev
Log:
Repository.mk needs to be in the repo dir, not module; repo is now extras

Added:
    incubator/ooo/trunk/extras/Repository.mk
      - copied, changed from r1166260, incubator/ooo/trunk/extras/l10n/Repository.mk
Modified:
    incubator/ooo/trunk/extras/l10n/Repository.mk
    incubator/ooo/trunk/main/set_soenv.in
    incubator/ooo/trunk/main/solenv/gbuild/AllLangResTarget.mk
    incubator/ooo/trunk/main/solenv/inc/settings.mk

Copied: incubator/ooo/trunk/extras/Repository.mk (from r1166260, incubator/ooo/trunk/extras/l10n/Repository.mk)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/extras/Repository.mk?p2=incubator/ooo/trunk/extras/Repository.mk&p1=incubator/ooo/trunk/extras/l10n/Repository.mk&r1=1166260&r2=1166306&rev=1166306&view=diff
==============================================================================
    (empty)

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1166306&r1=1166305&r2=1166306&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Wed Sep  7 18:31:50 2011
@@ -1502,7 +1502,7 @@ my $BUILD_TYPE = "@BUILD_TYPE@";
 
 if ('@WITH_LANG@' ne "")
 {
-    $gb_REPOS .= " ".$SOURCE_ROOT_DIR."/extras/l10n";
+    $gb_REPOS .= " ".$SOURCE_ROOT_DIR."/extras";
     $BUILD_TYPE = "@BUILD_TYPE@ L10N";
 }
 

Modified: incubator/ooo/trunk/main/solenv/gbuild/AllLangResTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/AllLangResTarget.mk?rev=1166306&r1=1166305&r2=1166306&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/AllLangResTarget.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/AllLangResTarget.mk Wed Sep  7 18:31:50 2011
@@ -31,7 +31,7 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $
 # gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
 
 gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/$(INPATH)/misc/sdf/
+gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf/
 gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
 
 define gb_SrsPartMergeTarget__command

Modified: incubator/ooo/trunk/main/solenv/inc/settings.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/settings.mk?rev=1166306&r1=1166305&r2=1166306&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/settings.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/settings.mk Wed Sep  7 18:31:50 2011
@@ -810,7 +810,7 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
 
 .EXPORT : SOLARBINDIR
 
-L10N_MODULE*=$(SOURCE_ROOT_DIR)/l10n/l10n
+L10N_MODULE*=$(SOURCE_ROOT_DIR)/extras/l10n
 ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
 
 .IF "$(WITH_LANG)"!=""



Mime
View raw message