[Libreoffice-commits] core.git: 2 commits - scp2/inc scp2/InstallModule_extensions.mk

[Michael Stahl]

 scp2/InstallModule_extensions.mk |    9 ---------
 scp2/inc/macros.inc              |   10 ----------
 2 files changed, 19 deletions(-)

New commits:
commit 35a81048ca2c11d0a1092d8178e070127fd5711b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 27 23:30:11 2014 +0200

    scp2: looks like those BSH_JAR RHINO_JAR macros are unused
    
    Change-Id: I6621529921120170bc1572dac727e9dc3b9438d5

diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk
index 3b1b43e..2511f1c 100644
--- a/scp2/InstallModule_extensions.mk
+++ b/scp2/InstallModule_extensions.mk
@@ -12,15 +12,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/extensions))
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_bsh))
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_rhino))
 
-$(eval $(call gb_InstallModule_add_defs,scp2/extensions,\
-	$(if $(SYSTEM_BSH),\
-		-DBSH_JAR=\""$(call gb_Helper_make_url,$(BSH_JAR))"\" \
-	) \
-	$(if $(SYSTEM_RHINO),\
-		-DRHINO_JAR=\""$(call gb_Helper_make_url,$(RHINO_JAR))"\" \
-	) \
-))
-
 $(eval $(call gb_InstallModule_add_templates,scp2/extensions,\
     scp2/source/templates/module_langpack_extensions_templates \
 ))
commit a3d89c3faf5b9807d60a98020677b9e0bcf7326e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 27 23:09:36 2014 +0200

    scp: remove unused STD_JAR_FILE, JARFILENAME
    
    Change-Id: I7e78e45b66ea2b74268f4e4479ebb0259eba130c

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index bed8deb..9497473 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -243,14 +243,6 @@ End
     End
 #endif
 
-#define STD_JAR_FILE(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Name     = STRING(CONCAT2(name,.jar)); \
-        Dir      = gid_Dir_Classes; \
-        Styles   = (PACKED); \
-    End
-
 #define LIBO_JAR_FILE(id,name) \
     File id \
         TXT_FILE_BODY; \
@@ -267,8 +259,6 @@ End
         Styles = (PACKED); \
     End
 
-#define JARFILENAME(name) STRING(CONCAT2(name,.jar))
-
 #define SPECIAL_COMPONENT_LIB_FILE(id,name) \
     File id \
         Name     = SPECIAL_COMPONENT_LIB_NAME(name); \