Skip to content

C
core
Kaydet (Commit) 376d1b59 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

scp2: move hsqldb to AutoInstall 

Change-Id: Ib72e509df6df51c4a42ea56ce7b1927a051baad4
üst 8475eb98
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
RepositoryExternal.mk
Dosyayı görüntüle @ 376d1b59
...@@ -3090,7 +3090,7 @@ endef ...@@ -3090,7 +3090,7 @@ endef
else # !SYSTEM_HSQLDB else # !SYSTEM_HSQLDB
$(eval $(call gb_Helper_register_jars,OOO,\ $(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
hsqldb \ hsqldb \
)) ))
......
scp2/AutoInstall.mk
Dosyayı görüntüle @ 376d1b59
...@@ -19,7 +19,7 @@ $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE)) ...@@ -19,7 +19,7 @@ $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1")) $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1"))
$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE))
$(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,python)) $(eval $(call gb_AutoInstall_add_module,python))
$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
......
scp2/source/ooo/file_ooo.scp
Dosyayı görüntüle @ 376d1b59
...@@ -316,9 +316,6 @@ STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge ) ...@@ -316,9 +316,6 @@ STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
#endif #endif
#ifdef ENABLE_JAVA #ifdef ENABLE_JAVA
#ifndef SYSTEM_HSQLDB
STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb )
#endif
STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb ) STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment