[Libreoffice-commits] core.git: rsc/source solenv/gbuild

[Caolán McNamara]

 rsc/source/parser/erscerr.cxx     |    1 -
 rsc/source/rsc/rsc.cxx            |   10 +---------
 solenv/gbuild/AllLangResTarget.mk |   13 ++-----------
 solenv/gbuild/Helper.mk           |    1 -
 solenv/gbuild/TargetLocations.mk  |    1 -
 5 files changed, 3 insertions(+), 23 deletions(-)

New commits:
commit bfc54ba3d2ac7f7ff40f8b3e95a6bd9b74bcd0c5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 27 14:43:08 2017 +0100

    cut top layer of detecting used bitmap resources in .src/.res files
    
    Change-Id: I476ff9f55c264983419d5410035c1dfe6e07d5a3
    Reviewed-on: https://gerrit.libreoffice.org/37035
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index ce67dfd9c60b..a6dcb46cf227 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -151,7 +151,6 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
             StdLstOut( "-fs=<filename> Name of the .res file.\n" );
             StdLstOut( "-lip=<path>    additional search path for system dependent files\n" );
             StdLstOut( "-fp=<filename> Renaming of the .srs file.\n" );
-            StdLstOut( "-oil=<dir>     Output directory for image list files\n" );
             StdLstOut( "-sub<ENV>=<path> replace <path> by <ENV> in image list files\n" );
             StdLstOut( "-BIGENDIAN    Format of number values.\n" );
             StdLstOut( "-LITTLEENDIAN Format of number values.\n" );
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index d1f19b7b103f..e736e618f8af 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -197,10 +197,6 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
                 aOutputSrs = (*ppStr) + 4;
                 bOutputSrsIsSet = true;
             }
-            else if( !rsc_strnicmp( (*ppStr) + 1, "oil=", 4 ) )
-            {
-                aILDir = (*ppStr) + 5;
-            }
             else if( !rsc_stricmp( (*ppStr) + 1, "NoSysResTest" ) )
             { // don't check Bitmap, Pointers, Icons
                 nCommands |= CommandFlags::NoSysResTest;
@@ -588,11 +584,7 @@ ERRTYPE RscCompiler::Link()
 
                 aRcTmp = lcl_getTempFile(sTempDirUrl);
 
-                OUString sOilDirUrl;
-                if(!pCL->aILDir.isEmpty())
-                    sOilDirUrl = lcl_getAbsoluteUrl(sPwdUrl, pCL->aILDir);
-                else
-                    sOilDirUrl = sTempDirUrl;
+                OUString sOilDirUrl = sTempDirUrl;
 
                 aSysListTmp = lcl_getTempFile(sOilDirUrl);
 
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index d31b10b23b3a..9da53605297e 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -244,15 +244,13 @@ $(call gb_ResTarget_get_clean_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -f \
 			$(call gb_ResTarget_get_target,$*) \
-			$(call gb_ResTarget_get_install_target,$*) \
-			$(call gb_ResTarget_get_imagelist_target,$*))
+			$(call gb_ResTarget_get_install_target,$*)
 
 $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
 		$(gb_ResTarget_RSCDEPS)
 	$(call gb_Output_announce,$*,$(true),RES,2)
 	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) \
-			$(dir $(call gb_ResTarget_get_imagelist_target,$*)) && \
+		mkdir -p $(dir $@) && \
 		RESPONSEFILE=`$(gb_MKTEMP)` && \
 		echo "-r -p \
 			-lg$(LANGUAGE) \
@@ -265,7 +263,6 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
 			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
 			-subMODULE=$(gb_ResTarget_DEFIMAGESLOCATION) \
 			-subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-			-oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \
 			$(filter-out $(gb_Helper_MISCDUMMY) $(gb_ResTarget_RSCDEPS),$^)" \
 			> $${RESPONSEFILE} && \
 		$(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
@@ -277,7 +274,6 @@ $(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
 $(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3)
 $(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2)
 $(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clean_target,$(1))
-$(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
 
 endef
 
@@ -365,9 +361,4 @@ $(foreach lang,$(gb_AllLangResTarget_LANGS),\
 
 endef
 
-define gb_AllLangResTarget_get_imagelists
-$(foreach lang,$(gb_AllLangResTarget_LANGS),\
-    $(call gb_ResTarget_get_imagelist_target,$(1)$(lang)))
-endef
-
 # vim: set noet sw=4: 
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 0693f139f365..0d45f071826e 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -270,7 +270,6 @@ gb_UIConfig_REGISTERED += $(1)
 endef
 
 define gb_Helper_get_imagelists
-$(foreach res,$(gb_AllLangResTarget_REGISTERED),$(call gb_AllLangResTarget_get_imagelists,$(res))) \
 $(foreach ui,$(gb_UIConfig_REGISTERED),$(call gb_UIConfig_get_imagelist_target,$(ui)))
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 394b44eae7d4..8ec6c4610ca3 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -144,7 +144,6 @@ gb_Pyuno_get_final_target = $(WORKDIR)/Pyuno/$(1).final
 gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).done
 gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb
 gb_Rdb_get_target_for_build = $(WORKDIR_FOR_BUILD)/Rdb/$(1).rdb
-gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
 gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
 gb_ScpMergeTarget_get_target = $(WORKDIR)/ScpMergeTarget/$(1).ulf
 gb_ScpPreprocessTarget_get_target = $(WORKDIR)/ScpPreprocessTarget/$(1).pre