[Libreoffice-commits] core.git: 2 commits - odk/CustomTarget_check.mk odk/CustomTarget_settings.mk odk/Package_settings_generated.mk odk/util

[David Tardon]

 odk/CustomTarget_check.mk         |    1 -
 odk/CustomTarget_settings.mk      |    6 +++---
 odk/Package_settings_generated.mk |    2 +-
 odk/util/check.pl                 |   13 ++++++-------
 4 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 45b95190860d714f7dba9dcca452931c199581a5
Author: David Tardon <dtardon at redhat.com>
Date:   Sat May 4 14:10:11 2013 +0200

    $(WORKDIR)/CustomTarget/odk/odkcommon is no more
    
    Change-Id: I49204b3518c47614e591de47a916901861331673
    Reviewed-on: https://gerrit.libreoffice.org/3777
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 74415a2..fb5b2d5 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -50,7 +50,6 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 	$(call gb_Helper_print_on_error,\
 		$(PERL) $< \
 			$(INSTDIR)/$(gb_Package_SDKDIRNAME) \
-			$(call gb_CustomTarget_get_workdir,odk/odkcommon) \
 			$(odk_PLATFORM) "$(gb_Executable_EXT)" \
 		,$@.log \
 	)
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 542361e..5a2df16 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -23,26 +23,25 @@
 
 $return = 0;
 
-$PrimaryDir = "$ARGV[0]";
-$SecondaryDir = "$ARGV[1]";
-$OperatingSystem = "$ARGV[2]";
-$ExePrefix = "$ARGV[3]";
+$SdkDir = "$ARGV[0]";
+$OperatingSystem = "$ARGV[1]";
+$ExePrefix = "$ARGV[2]";
 
 sub check_file
 {
     my ($file) = @_;
-    return -e "$PrimaryDir/$file" || -e "$SecondaryDir/$file";
+    return -e "$SdkDir/$file";
 }
 
 sub check_dir
 {
     my ($dir) = @_;
-    return -d "$PrimaryDir/$dir" || -d "$SecondaryDir/$dir";
+    return -d "$SdkDir/$dir";
 }
 
 print "Check for $OperatingSystem\n";
 
-if (-d "$PrimaryDir" || -d "$SecondaryDir") {
+if (-d "$SdkDir") {
     # check binaries
     print "check binaries: ";
     if (check_dir("bin")) {
commit da7e3fca9f9b9529a4fa81204b2b22c862bffbb3
Author: David Tardon <dtardon at redhat.com>
Date:   Sat May 4 14:08:33 2013 +0200

    drop unneeded odkcommon/
    
    Change-Id: Id88a58e43fd7a39fdbc7545a0618b05070b1270e
    Reviewed-on: https://gerrit.libreoffice.org/3776
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk
index 581d522..242dd68 100644
--- a/odk/CustomTarget_settings.mk
+++ b/odk/CustomTarget_settings.mk
@@ -7,11 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/settings))
+$(eval $(call gb_CustomTarget_CustomTarget,odk/settings))
 
-$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,dk.mk))
+$(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk))
 
-$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk
+$(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1)
 	tr -d "\015" < $< | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \
 		-e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \
diff --git a/odk/Package_settings_generated.mk b/odk/Package_settings_generated.mk
index 3813d98..1b3f637 100644
--- a/odk/Package_settings_generated.mk
+++ b/odk/Package_settings_generated.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,odk_settings_generated,$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)))
+$(eval $(call gb_Package_Package,odk_settings_generated,$(call gb_CustomTarget_get_workdir,odk/settings)))
 
 $(eval $(call gb_Package_set_outdir,odk_settings_generated,$(INSTDIR)))