[Libreoffice-commits] core.git: 5 commits - .gitignore jfreereport/Module_jfreereport.mk jfreereport/Package_jfreereport_version.mk sc/source solenv/gbuild
David Tardon
dtardon at redhat.com
Sat Apr 6 04:34:14 PDT 2013
.gitignore | 1
jfreereport/Module_jfreereport.mk | 1
jfreereport/Package_jfreereport_version.mk | 14 -
sc/source/ui/collab/sendfunc.cxx | 221 +++++++++++++++++++++++++++++
sc/source/ui/collab/sendfunc.hxx | 218 ----------------------------
solenv/gbuild/HelpTarget.mk | 6
solenv/gbuild/JavaClassSet.mk | 4
solenv/gbuild/Module.mk | 10 +
solenv/gbuild/Pagein.mk | 2
solenv/gbuild/UnpackedTarball.mk | 7
solenv/gbuild/Zip.mk | 2
11 files changed, 241 insertions(+), 245 deletions(-)
New commits:
commit 2149279914e7581adea62ad0b971bc377ab2d056
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 6 13:33:20 2013 +0200
add instdir to .gitignore
Change-Id: I73ce022d064c7ccfeb71f5560f112aac3d777bf7
diff --git a/.gitignore b/.gitignore
index 8a45289..8e1dea9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
#
# where stuff are built
+/instdir
/workdir
/solver
commit ff4448a79e9670ae5b825261916b2dd91c7ff6cb
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 6 13:32:04 2013 +0200
fix compilation error
Change-Id: Ife833566122da25c366938c9c2d127fca0903bb7
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 37f51c2..a02cf54 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -32,6 +32,7 @@
#include "docsh.hxx"
#include "docfunc.hxx"
#include "sccollaboration.hxx"
+#include <editeng/editeng.hxx>
#include <editeng/editobj.hxx>
#include <tubes/manager.hxx>
@@ -52,7 +53,9 @@ OUString editToString( const EditTextObject& /*rEditText*/ )
EditTextObject stringToEdit( const OUString& rStr )
{
// FIXME: implement me.
- return EditTextObject();
+ // The code here only serves to make this file compilable.
+ EditEngine aEditEngine(0);
+ return *aEditEngine.CreateTextObject();
}
ScFormulaCell* stringToFormulaCell( const OUString &rString )
commit ab382911aeb83d6a8f5347f6d5502daab87924dd
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 6 13:10:37 2013 +0200
move anonymous namespace to .cxx
Change-Id: I52d2ed4b0454233da21e9040dd324772247113c1
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 75233cf..37f51c2 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -32,8 +32,226 @@
#include "docsh.hxx"
#include "docfunc.hxx"
#include "sccollaboration.hxx"
+#include <editeng/editobj.hxx>
#include <tubes/manager.hxx>
+namespace {
+
+OUString formulaCellToString( ScFormulaCell *pCell )
+{
+ (void)pCell; // FIXME: implement me
+ return OUString();
+}
+
+OUString editToString( const EditTextObject& /*rEditText*/ )
+{
+ // FIXME: implement me.
+ return OUString();
+}
+
+EditTextObject stringToEdit( const OUString& rStr )
+{
+ // FIXME: implement me.
+ return EditTextObject();
+}
+
+ScFormulaCell* stringToFormulaCell( const OUString &rString )
+{
+ (void)rString; // FIXME: implement me
+ return NULL;
+}
+
+struct ProtocolError {
+ const char *message;
+};
+
+class ScChangeOpReader {
+ std::vector< rtl::OUString > maArgs;
+
+public:
+ ScChangeOpReader( const rtl::OUString &rString)
+ {
+ // will need to handle escaping etc.
+ // Surely someone else wrote this before ! [!?]
+ enum {
+ IN_TEXT, CHECK_QUOTE, FIND_LAST_QUOTE, SKIP_SEMI
+ } eState = CHECK_QUOTE;
+
+ sal_Int32 nStart = 0;
+ for (sal_Int32 n = 0; n < rString.getLength(); n++)
+ {
+ if (rString[n] == '\\')
+ {
+ n++; // skip next char
+ continue;
+ }
+ switch (eState) {
+ case CHECK_QUOTE:
+ if (rString[n] == '"')
+ {
+ nStart = n + 1;
+ eState = FIND_LAST_QUOTE;
+ break;
+ }
+ // else drop through
+ case IN_TEXT:
+ if (rString[n] == ';')
+ {
+ maArgs.push_back( rString.copy( nStart, n - nStart ) );
+ nStart = n + 1;
+ eState = CHECK_QUOTE;
+ }
+ break;
+ case FIND_LAST_QUOTE:
+ if (rString[n] == '"')
+ {
+ maArgs.push_back( rString.copy( nStart, n - nStart ) );
+ eState = SKIP_SEMI;
+ break;
+ }
+ break;
+ case SKIP_SEMI:
+ if (rString[n] == ';')
+ {
+ nStart = n + 1;
+ eState = CHECK_QUOTE;
+ }
+ break;
+ }
+ }
+ if ( nStart < rString.getLength())
+ maArgs.push_back( rString.copy( nStart, rString.getLength() - nStart ) );
+ }
+ ~ScChangeOpReader() {}
+
+ rtl::OUString getMethod()
+ {
+ return maArgs[0];
+ }
+
+ size_t getArgCount() { return maArgs.size(); }
+
+ rtl::OUString getString( sal_Int32 n )
+ {
+ if (n > 0 && (size_t)n < getArgCount() )
+ {
+ rtl::OUString aUStr( maArgs[ n ] );
+ ScGlobal::EraseQuotes( aUStr );
+ return aUStr;
+ } else
+ return rtl::OUString();
+ }
+
+ ScAddress getAddress( sal_Int32 n )
+ {
+ ScAddress aAddr;
+ rtl::OUString aToken( getString( n ) );
+ aAddr.Parse( aToken );
+ return aAddr;
+ }
+
+ sal_Int32 getInt( sal_Int32 n )
+ {
+ return getString( n ).toInt32();
+ }
+
+ bool getBool( sal_Int32 n )
+ {
+ return getString( n ).equalsIgnoreAsciiCase( "true" );
+ }
+
+ ScFormulaCell* getFormulaCell( sal_Int32 n )
+ {
+ return stringToFormulaCell( getString( n ) );
+ }
+
+ double getDouble( sal_Int32 n )
+ {
+ return getString(n).toDouble();
+ }
+
+ EditTextObject getEdit( sal_Int32 n )
+ {
+ return stringToEdit(getString(n));
+ }
+
+};
+
+} // anonymous namespace
+
+// Ye noddy mangling - needs improvement ...
+// method name ';' then arguments ; separated
+class ScChangeOpWriter
+{
+ rtl::OUStringBuffer aMessage;
+ void appendSeparator()
+ {
+ aMessage.append( sal_Unicode( ';' ) );
+ }
+
+public:
+ ScChangeOpWriter( const char *pName )
+ {
+ aMessage.appendAscii( pName );
+ appendSeparator();
+ }
+
+ void appendString( const rtl::OUString &rStr )
+ {
+ if ( rStr.indexOf( sal_Unicode( '"' ) ) >= 0 ||
+ rStr.indexOf( sal_Unicode( ';' ) ) >= 0 )
+ {
+ rtl::OUString aQuoted( rStr );
+ ScGlobal::AddQuotes( aQuoted, sal_Unicode( '"' ) );
+ aMessage.append( aQuoted );
+ }
+ else
+ aMessage.append( rStr );
+ appendSeparator();
+ }
+
+ void appendAddress( const ScAddress &rPos )
+ {
+ rtl::OUString aStr;
+ rPos.Format( aStr, SCA_VALID );
+ aMessage.append( aStr );
+ appendSeparator();
+ }
+
+ void appendInt( sal_Int32 i )
+ {
+ aMessage.append( i );
+ appendSeparator();
+ }
+
+ void appendBool( sal_Bool b )
+ {
+ aMessage.appendAscii( b ? "true" : "false" );
+ appendSeparator();
+ }
+
+ void appendFormulaCell( ScFormulaCell *pCell )
+ {
+ appendString( formulaCellToString( pCell ) );
+ }
+
+ void appendEditText( const EditTextObject& rStr )
+ {
+ appendString( editToString(rStr) );
+ }
+
+ void appendDouble( double fVal )
+ {
+ aMessage.append(fVal);
+ appendSeparator();
+ }
+
+ rtl::OString toString()
+ {
+ return rtl::OUStringToOString( aMessage.toString(), RTL_TEXTENCODING_UTF8 );
+ }
+};
+
void ScDocFuncSend::RecvMessage( const rtl::OString &rString )
{
try {
diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx
index 032ff01..fa2d1fc 100644
--- a/sc/source/ui/collab/sendfunc.hxx
+++ b/sc/source/ui/collab/sendfunc.hxx
@@ -14,223 +14,7 @@
#include "docfunc.hxx"
class ScCollaboration;
-
-namespace {
-
-OUString formulaCellToString( ScFormulaCell *pCell )
-{
- (void)pCell; // FIXME: implement me
- return OUString();
-}
-
-OUString editToString( const EditTextObject& /*rEditText*/ )
-{
- // FIXME: implement me.
- return OUString();
-}
-
-EditTextObject stringToEdit( const OUString& rStr )
-{
- // FIXME: implement me.
- return EditTextObject();
-}
-
-ScFormulaCell* stringToFormulaCell( const OUString &rString )
-{
- (void)rString; // FIXME: implement me
- return NULL;
-}
-
-// Ye noddy mangling - needs improvement ...
-// method name ';' then arguments ; separated
-class ScChangeOpWriter
-{
- rtl::OUStringBuffer aMessage;
- void appendSeparator()
- {
- aMessage.append( sal_Unicode( ';' ) );
- }
-
-public:
- ScChangeOpWriter( const char *pName )
- {
- aMessage.appendAscii( pName );
- appendSeparator();
- }
-
- void appendString( const rtl::OUString &rStr )
- {
- if ( rStr.indexOf( sal_Unicode( '"' ) ) >= 0 ||
- rStr.indexOf( sal_Unicode( ';' ) ) >= 0 )
- {
- rtl::OUString aQuoted( rStr );
- ScGlobal::AddQuotes( aQuoted, sal_Unicode( '"' ) );
- aMessage.append( aQuoted );
- }
- else
- aMessage.append( rStr );
- appendSeparator();
- }
-
- void appendAddress( const ScAddress &rPos )
- {
- rtl::OUString aStr;
- rPos.Format( aStr, SCA_VALID );
- aMessage.append( aStr );
- appendSeparator();
- }
-
- void appendInt( sal_Int32 i )
- {
- aMessage.append( i );
- appendSeparator();
- }
-
- void appendBool( sal_Bool b )
- {
- aMessage.appendAscii( b ? "true" : "false" );
- appendSeparator();
- }
-
- void appendFormulaCell( ScFormulaCell *pCell )
- {
- appendString( formulaCellToString( pCell ) );
- }
-
- void appendEditText( const EditTextObject& rStr )
- {
- appendString( editToString(rStr) );
- }
-
- void appendDouble( double fVal )
- {
- aMessage.append(fVal);
- appendSeparator();
- }
-
- rtl::OString toString()
- {
- return rtl::OUStringToOString( aMessage.toString(), RTL_TEXTENCODING_UTF8 );
- }
-};
-
-struct ProtocolError {
- const char *message;
-};
-
-class ScChangeOpReader {
- std::vector< rtl::OUString > maArgs;
-
-public:
- ScChangeOpReader( const rtl::OUString &rString)
- {
- // will need to handle escaping etc.
- // Surely someone else wrote this before ! [!?]
- enum {
- IN_TEXT, CHECK_QUOTE, FIND_LAST_QUOTE, SKIP_SEMI
- } eState = CHECK_QUOTE;
-
- sal_Int32 nStart = 0;
- for (sal_Int32 n = 0; n < rString.getLength(); n++)
- {
- if (rString[n] == '\\')
- {
- n++; // skip next char
- continue;
- }
- switch (eState) {
- case CHECK_QUOTE:
- if (rString[n] == '"')
- {
- nStart = n + 1;
- eState = FIND_LAST_QUOTE;
- break;
- }
- // else drop through
- case IN_TEXT:
- if (rString[n] == ';')
- {
- maArgs.push_back( rString.copy( nStart, n - nStart ) );
- nStart = n + 1;
- eState = CHECK_QUOTE;
- }
- break;
- case FIND_LAST_QUOTE:
- if (rString[n] == '"')
- {
- maArgs.push_back( rString.copy( nStart, n - nStart ) );
- eState = SKIP_SEMI;
- break;
- }
- break;
- case SKIP_SEMI:
- if (rString[n] == ';')
- {
- nStart = n + 1;
- eState = CHECK_QUOTE;
- }
- break;
- }
- }
- if ( nStart < rString.getLength())
- maArgs.push_back( rString.copy( nStart, rString.getLength() - nStart ) );
- }
- ~ScChangeOpReader() {}
-
- rtl::OUString getMethod()
- {
- return maArgs[0];
- }
-
- size_t getArgCount() { return maArgs.size(); }
-
- rtl::OUString getString( sal_Int32 n )
- {
- if (n > 0 && (size_t)n < getArgCount() )
- {
- rtl::OUString aUStr( maArgs[ n ] );
- ScGlobal::EraseQuotes( aUStr );
- return aUStr;
- } else
- return rtl::OUString();
- }
-
- ScAddress getAddress( sal_Int32 n )
- {
- ScAddress aAddr;
- rtl::OUString aToken( getString( n ) );
- aAddr.Parse( aToken );
- return aAddr;
- }
-
- sal_Int32 getInt( sal_Int32 n )
- {
- return getString( n ).toInt32();
- }
-
- bool getBool( sal_Int32 n )
- {
- return getString( n ).equalsIgnoreAsciiCase( "true" );
- }
-
- ScFormulaCell* getFormulaCell( sal_Int32 n )
- {
- return stringToFormulaCell( getString( n ) );
- }
-
- double getDouble( sal_Int32 n )
- {
- return getString(n).toDouble();
- }
-
- EditTextObject getEdit( sal_Int32 n )
- {
- return stringToEdit(getString(n));
- }
-
-};
-
-} // anonymous namespace
+class ScChangeOpWriter;
class ScDocFuncSend : public ScDocFunc
{
commit ff52d60b166f6758cacf639311244a594bb8d2ab
Author: David Tardon <dtardon at redhat.com>
Date: Fri Apr 5 17:32:32 2013 +0200
jfreereport_version.mk does not need to be delivered
Change-Id: Iac1d8d0646bff131b1ade79bb47a914b350f31f2
diff --git a/jfreereport/Module_jfreereport.mk b/jfreereport/Module_jfreereport.mk
index ffaa942..55537a8 100644
--- a/jfreereport/Module_jfreereport.mk
+++ b/jfreereport/Module_jfreereport.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_Module_add_targets,jfreereport,\
UnpackedTarball_jfreereport_flow_engine \
ExternalProject_jfreereport_flow_engine \
Package_jfreereport_flow_engine \
- Package_jfreereport_version \
))
endif
endif
diff --git a/jfreereport/Package_jfreereport_version.mk b/jfreereport/Package_jfreereport_version.mk
deleted file mode 100644
index 5384d6a..0000000
--- a/jfreereport/Package_jfreereport_version.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,jfreereport_version,$(SRCDIR)/jfreereport))
-
-$(eval $(call gb_Package_add_file,jfreereport_version,bin/jfreereport_version.mk,version.mk))
-
-# vim: set noet sw=4 ts=4:
commit 5c021048638ce29a2e4c848f725e4a7447f8522f
Author: David Tardon <dtardon at redhat.com>
Date: Fri Apr 5 17:27:22 2013 +0200
provide an easy way to depend on makefile from gbuild classes
$(lastword $(MAKEFILE_LIST)) is not what is expected if the makefile
includes other makefile as the first step (as some do). See
UnpackedTarball.mk, where I already tried to workaround the problem.
Change-Id: Ib713a698f52ba16f46fbbc4c50b43edd69c9a472
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index b316c40..9fd03b8 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -73,7 +73,7 @@ define gb_HelpTranslatePartTarget_HelpTranslatePartTarget
$(call gb_HelpTranslatePartTarget_get_target,$(1)) : HELP_LANG := $(2)
$(call gb_HelpTranslatePartTarget_get_target,$(1)) : POFILES := $(gb_POLOCATION)/$(2)/$(3).po
-$(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(lastword $(MAKEFILE_LIST))
+$(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
$(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(gb_POLOCATION)/$(2)/$(3).po
$(gb_POLOCATION)/$(2)/$(3).po :
$(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(dir $(call gb_HelpTranslatePartTarget_get_target,$(1))).dir
@@ -312,7 +312,6 @@ $(call gb_HelpLinkTarget_get_clean_target,%) :
#
# gb_HelpLinkTarget_HelpLinkTarget name module lang workdir
define gb_HelpLinkTarget_HelpLinkTarget
-$(call gb_HelpLinkTarget_get_target,$(1)) : $(lastword $(MAKEFILE_LIST))
$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_ADD_FILES :=
$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_CONFIGDIR :=
$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_EXTRA_ADD_FILES :=
@@ -325,6 +324,7 @@ $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_SRCDIR :=
$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_TREE :=
$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_WORKDIR := $(4)
+$(call gb_HelpLinkTarget_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
$(call gb_HelpLinkTarget_get_target,$(1)) :| $(dir $(call gb_HelpLinkTarget_get_target,$(1))).dir
endef
@@ -558,7 +558,7 @@ $(call gb_HelpTarget_get_target,$(1)) : HELP_LANG := $(3)
$(call gb_HelpTarget_get_target,$(1)) : HELP_PACK_FILES :=
$(call gb_HelpTarget_get_translation_target,$(1)) : HELP_FILES :=
-$(call gb_HelpTarget_get_translation_target,$(1)) : $(lastword $(MAKEFILE_LIST))
+$(call gb_HelpTarget_get_translation_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
$(call gb_HelpTarget__HelpTarget_impl,$(1),$(2),$(3),$(call gb_HelpTarget_get_workdir,$(1)))
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 2a81a87..7dd586a 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -71,10 +71,10 @@ $(call gb_JavaClassSet_get_preparation_target,%) :
# depend on makefile to enforce a rebuild if files are removed from the classset
define gb_JavaClassSet_JavaClassSet
$(call gb_JavaClassSet_get_target,$(1)) : \
- $(lastword $(MAKEFILE_LIST)) \
+ $(gb_Module_CURRENTMAKEFILE) \
$(call gb_JavaClassSet_get_preparation_target,$(1))
$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := \
- $(lastword $(MAKEFILE_LIST)) \
+ $(gb_Module_CURRENTMAKEFILE) \
$(call gb_JavaClassSet_get_preparation_target,$(1))
endef
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 68c171f..e451563 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -54,6 +54,14 @@ gb_Module_SLOWCHECKTARGETSTACK :=
gb_Module_SUBSEQUENTCHECKTARGETSTACK :=
gb_Module_CLEANTARGETSTACK :=
+# The currently read gbuild makefile.
+#
+# gbuild classes should use this if they need to depend on their makefile
+# (e.g., to make sure a zip file is rebuilt if files are removed from it).
+# Because makefiles may include other makefiles, it is not safe to rely
+# on $(MAKEFILE_LIST).
+gb_Module_CURRENTMAKEFILE :=
+
.PHONY : $(call gb_Module_get_clean_target,%)
$(call gb_Module_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),MOD,5)
@@ -187,7 +195,9 @@ endef
define gb_Module__read_targetfile
gb_Module_CURRENTTARGET :=
gb_Module_CURRENTCLEANTARGET :=
+gb_Module_CURRENTMAKEFILE := $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2).mk
include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2).mk
+gb_Module_CURRENTMAKEFILE :=
ifneq ($$(words $$(gb_Module_CURRENTTARGET)) $$(words $$(gb_Module_CURRENTCLEANTARGET)),1 1)
$$(eval $$(call gb_Output_error,No $(3) registered while reading $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2).mk!))
endif
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 1fe74c0..10ba33e 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -56,7 +56,7 @@ $(call gb_Pagein_get_target,%) :
define gb_Pagein_Pagein
$(call gb_Pagein_get_target,$(1)) : OBJECTS :=
-$(call gb_Pagein_get_target,$(1)) : $(realpath $(lastword $(MAKEFILE_LIST)))
+$(call gb_Pagein_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
$$(eval $$(call gb_Module_register_target,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call gb_Pagein_get_outdir_target,$(1)))
$(call gb_Deliver_add_deliverable,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_target,$(1)),$(1))
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 87c25a5..dd47a35 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -185,11 +185,6 @@ $(call gb_UnpackedTarball_get_clean_target,%) :
$(call gb_UnpackedTarball_get_pristine_dir,$*) \
)
-define gb_UnpackedTarball__get_makefile
-$(lastword $(foreach makefile,$(MAKEFILE_LIST),$(if $(filter UnpackedTarball_%,$(notdir $(makefile))),$(makefile))))
-
-endef
-
# Initialize unpacked tarball
define gb_UnpackedTarball_UnpackedTarball_internal
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_DESTFILES :=
@@ -199,7 +194,7 @@ $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHES :=
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHLEVEL := $(gb_UnpackedTarball_PATCHLEVEL_DEFAULT)
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION :=
-$(call gb_UnpackedTarball_get_preparation_target,$(1)) : $(call gb_UnpackedTarball__get_makefile)
+$(call gb_UnpackedTarball_get_preparation_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
$(call gb_UnpackedTarball_get_preparation_target,$(1)) :| $(dir $(call gb_UnpackedTarball_get_target,$(1))).dir
$(call gb_UnpackedTarball_get_target,$(1)) : $(call gb_UnpackedTarball_get_preparation_target,$(1))
$(call gb_UnpackedTarball_get_target,$(1)) :| $(dir $(call gb_UnpackedTarball_get_target,$(1))).dir
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index ace9457..25b15ba 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -92,7 +92,7 @@ endef
# depend on makefile to enforce a rebuild if files are removed from the zip
define gb_Zip_Zip
$(call gb_Zip_Zip_internal,$(1),$(2))
-$(call gb_Zip_get_target,$(1)) : $(lastword $(MAKEFILE_LIST))
+$(call gb_Zip_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
$(eval $(call gb_Module_register_target,$(call gb_Zip_get_final_target,$(1)),$(call gb_Zip_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Zip,$(call gb_Zip_get_final_target,$(1)))
More information about the Libreoffice-commits
mailing list