mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scp2: move URE jars to AutoInstall

Browse Source 
Change-Id: I68c5f5ac015e8c5d8efd60921f38eb31c6f8088d
This commit is contained in:
Michael Stahl
2014-02-04 18:03:46 +01:00
parent 429255d163
commit 9870a5f73d
4 changed files with 16 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Repository.mk
View File

@@ -636,15 +636,19 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
passive_native \ passive_native \
)) ))
$(eval $(call gb_Helper_register_jars,URE, \ ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Helper_register_jars_for_install,URE,ure, \
java_uno \ java_uno \
juh \ juh \
jurt \ jurt \
ridl \ ridl \
testComponent \
unoloader \ unoloader \
)) ))
$(eval $(call gb_Helper_register_jars,URE, \
testComponent \
))
$(eval $(call gb_Helper_register_jars,OOO, \ $(eval $(call gb_Helper_register_jars,OOO, \
ConnectivityTools \ ConnectivityTools \
ScriptFramework \ ScriptFramework \
@@ -694,6 +698,7 @@ $(eval $(call gb_Helper_register_jars,NONE,\
test \ test \
test-tools \ test-tools \
)) ))
endif
# External executables # External executables
$(eval $(call gb_ExternalExecutable_register_executables,\ $(eval $(call gb_ExternalExecutable_register_executables,\

2
scp2/AutoInstall.mk
View File

@@ -22,7 +22,7 @@ $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))

8
scp2/inc/macros.inc
View File

@@ -222,6 +222,14 @@
Styles = (PACKED,DONT_OVERWRITE); \ Styles = (PACKED,DONT_OVERWRITE); \
End End
#define URE_JAR_FILE(id,name) \
File id \
TXT_FILE_BODY; \
Name = name; \
Dir = GID_DIR_URE_JAVA; \
Styles = (PACKED); \
End
#define JARFILENAME(name) STRING(CONCAT2(name,.jar)) #define JARFILENAME(name) STRING(CONCAT2(name,.jar))
#define SPECIAL_COMPONENT_LIB_FILE(id,name) \ #define SPECIAL_COMPONENT_LIB_FILE(id,name) \

54
scp2/source/ooo/ure.scp
View File

@@ -510,55 +510,6 @@ End
#endif #endif
// Public JARs:
#if defined ENABLE_JAVA
File gid_File_Java_UnoloaderJar
TXT_FILE_BODY;
Dir = GID_DIR_URE_JAVA;
Name = "unoloader.jar";
Styles = (PACKED);
End
#endif
#if defined ENABLE_JAVA
File gid_File_Java_JuhJar
TXT_FILE_BODY;
Dir = GID_DIR_URE_JAVA;
Name = "juh.jar";
Styles = (PACKED);
End
#endif
#if defined ENABLE_JAVA
File gid_File_Java_JurtJar
TXT_FILE_BODY;
Dir = GID_DIR_URE_JAVA;
Name = "jurt.jar";
Styles = (PACKED);
End
#endif
#if defined ENABLE_JAVA
File gid_File_Java_RidlJar
TXT_FILE_BODY;
Dir = GID_DIR_URE_JAVA;
Name = "ridl.jar";
Styles = (PACKED);
End
#endif
// Private JARs:
#if defined ENABLE_JAVA
File gid_File_Java_JavaUnoJar
TXT_FILE_BODY;
Dir = GID_DIR_URE_JAVA;
Name = "java_uno.jar";
Styles = (PACKED);
End
#endif
// Public Miscellaneous Files: // Public Miscellaneous Files:
File gid_File_Misc_TypesRdb File gid_File_Misc_TypesRdb
@@ -647,11 +598,6 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Lib_Msvcp80_Ure, gid_File_Lib_Msvcp80_Ure,
gid_File_Lib_Msvcm80_Ure, gid_File_Lib_Msvcm80_Ure,
gid_File_Msvcm80crt_Manifest_Ure, gid_File_Msvcm80crt_Manifest_Ure,
gid_File_Java_UnoloaderJar,
gid_File_Java_JuhJar,
gid_File_Java_JurtJar,
gid_File_Java_RidlJar,
gid_File_Java_JavaUnoJar,
gid_File_Misc_TypesRdb, gid_File_Misc_TypesRdb,
gid_File_Misc_ServicesRdb, gid_File_Misc_ServicesRdb,
gid_File_Misc_JavavendorsXml); gid_File_Misc_JavavendorsXml);