[Libreoffice-commits] core.git: 25 commits - Repository.mk scp2/inc scp2/source
Bjoern Michaelsen
bjoern.michaelsen at canonical.com
Mon Feb 25 06:54:56 PST 2013
Repository.mk | 56 +++++++++++++----------
scp2/inc/macros.inc | 8 ---
scp2/source/calc/file_calc.scp | 2
scp2/source/graphicfilter/file_graphicfilter.scp | 2
scp2/source/ooo/file_library_ooo.scp | 48 -------------------
scp2/source/ooo/file_ooo.scp | 48 +++++++++----------
6 files changed, 58 insertions(+), 106 deletions(-)
New commits:
commit b0565809774c27b2ec72b036ced42b935b7b4be9
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:49:49 2013 +0100
fdo#60924: move writerfilter from scp2 to gbuild
Change-Id: I17f68196edeb685fb8d3f95616be1199fd5f1de2
diff --git a/Repository.mk b/Repository.mk
index 199816a..5c1ca37 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -259,6 +259,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
odbcbase \
t602filter \
wpftwriter \
+ writerfilter \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
@@ -403,7 +404,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
vclplug_kde4 \
vclplug_svp \
wpftdraw \
- writerfilter \
xmlscript \
xmlfa \
xmlfd \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 105beaa..1da3175 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -786,8 +786,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
#endif
-STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
-
STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
commit 38ea2837998e5f8036184c06a285ddb8bc599337
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:49:01 2013 +0100
fdo#60924: move lwpft from scp2 to gbuild
Change-Id: Icb3044f1dc8b8a816cc93c9764908532a9cdcec4
diff --git a/Repository.mk b/Repository.mk
index 7bcf15d..199816a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -254,6 +254,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
fwl \
fwm \
lng \
+ lwpft \
sdbt \
odbcbase \
t602filter \
@@ -330,7 +331,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
kabdrv1 \
lnth \
log \
- lwpft \
MacOSXSpell \
merged \
mork \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 4268b1c..105beaa 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -786,8 +786,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
#endif
-STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
-
STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
commit 3d61a90591f53f3d73764915fa8b6368ccad4eba
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:48:18 2013 +0100
fdo#60924: move t602filter from scp2 to gbuild
Change-Id: Ib655b1177ffb4609bd7c50d54a818de659f284f3
diff --git a/Repository.mk b/Repository.mk
index 7339d94..7bcf15d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -256,6 +256,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
lng \
sdbt \
odbcbase \
+ t602filter \
wpftwriter \
))
@@ -380,7 +381,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
sw \
swd \
swui \
- t602filter \
tdeab1 \
tdeabdrv1 \
textconversiondlgs \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index e8e39b4..4268b1c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -786,8 +786,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
#endif
-STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
-
STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
commit 6d1cc9dca3d541be9354903cf2ae77899b703987
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:47:41 2013 +0100
fdo#60924: move wpftwriter from scp2 to gbuild
Change-Id: I7e12a4ddd68ffb2c2b1cd1730a8ab17c79311fb2
diff --git a/Repository.mk b/Repository.mk
index bfb143a..7339d94 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -256,6 +256,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
lng \
sdbt \
odbcbase \
+ wpftwriter \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
@@ -402,7 +403,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
vclplug_kde4 \
vclplug_svp \
wpftdraw \
- wpftwriter \
writerfilter \
xmlscript \
xmlfa \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 7e23e8d..e8e39b4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -786,8 +786,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
#endif
-STD_LIB_FILE(gid_File_Lib_WpftWriter,wpftwriter)
-
STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
commit b2d2d57530b7f45fe0addbd13463f63005332451
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:46:31 2013 +0100
fdo#60924: move lng from scp2 to gbuild
Change-Id: I006230e190eb4e35f72c598c0016f7a7aa27cc7d
diff --git a/Repository.mk b/Repository.mk
index dafdaf2..bfb143a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -253,6 +253,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
fwi \
fwl \
fwm \
+ lng \
sdbt \
odbcbase \
))
@@ -325,7 +326,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
jdbc \
kab1 \
kabdrv1 \
- lng \
lnth \
log \
lwpft \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 4fe4a82..7e23e8d 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -706,8 +706,6 @@ End
#endif
-STD_LIB_FILE( gid_File_Lib_Lng, lng)
-
File gid_File_Lib_Localedata_En
LIB_FILE_BODY;
#ifdef UNX
commit 65875bfafb5d41c0624db605521bb5586142e0fc
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:45:40 2013 +0100
fdo#60924: move fwm from scp2 to gbuild
Change-Id: Iaced34a334e216ac2f4df783d76fb3003051e3b5
diff --git a/Repository.mk b/Repository.mk
index 5efeb37..dafdaf2 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -252,6 +252,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
fwe \
fwi \
fwl \
+ fwm \
sdbt \
odbcbase \
))
@@ -305,7 +306,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
flat \
for \
fwk \
- fwm \
guesslang \
helplinker \
hwp \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 7c33717..4fe4a82 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -580,8 +580,6 @@ File gid_File_Lib_Fwk
Dir = SCP2_OOO_BIN_DIR;
End
-STD_LIB_FILE( gid_File_Lib_Fwm , fwm)
-
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
commit c21d6847a35e4feca57f888c3e8a4f8c4ee5bc95
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:45:07 2013 +0100
fdo#60924: move fwl from scp2 to gbuild
Change-Id: I7687af837d116ef7ec444049d941f3ca337aca03
diff --git a/Repository.mk b/Repository.mk
index b685052..5efeb37 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -251,6 +251,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
frm \
fwe \
fwi \
+ fwl \
sdbt \
odbcbase \
))
@@ -304,7 +305,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
flat \
for \
fwk \
- fwl \
fwm \
guesslang \
helplinker \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index eb9324e..7c33717 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -580,8 +580,6 @@ File gid_File_Lib_Fwk
Dir = SCP2_OOO_BIN_DIR;
End
-STD_LIB_FILE( gid_File_Lib_Fwl , fwl)
-
STD_LIB_FILE( gid_File_Lib_Fwm , fwm)
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
commit 167458f0306cc4cd144e9c61abc198239d505c88
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:44:36 2013 +0100
fdo#60924: move fwi from scp2 to gbuild
Change-Id: Ib7721d6b97b2d5f11f9f6dd05f5bc236c09c4f42
diff --git a/Repository.mk b/Repository.mk
index ee1d5be..b685052 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -250,6 +250,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
file \
frm \
fwe \
+ fwi \
sdbt \
odbcbase \
))
@@ -302,7 +303,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
flash \
flat \
for \
- fwi \
fwk \
fwl \
fwm \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index d912b01..eb9324e 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -573,8 +573,6 @@ End
#endif
-STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
-
File gid_File_Lib_Fwk
Name = LIBNAME(fwk);
LIB_FILE_BODY;
commit 28dd47a70b6210fcf6848c0e569807538c3a451d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:44:12 2013 +0100
fdo#60924: move fwe from scp2 to gbuild
Change-Id: I2bb9d4598d31462f9b661ed076046eb643c0a9e5
diff --git a/Repository.mk b/Repository.mk
index e3a5a69..ee1d5be 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -249,6 +249,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
drawinglayer \
file \
frm \
+ fwe \
sdbt \
odbcbase \
))
@@ -301,7 +302,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
flash \
flat \
for \
- fwe \
fwi \
fwk \
fwl \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index c709fa7..d912b01 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -573,8 +573,6 @@ End
#endif
-STD_LIB_FILE( gid_File_Lib_Fwe , fwe)
-
STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
File gid_File_Lib_Fwk
commit 9cc557720fe8951d99b1b60b45ca41372eb4d7e8
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:43:37 2013 +0100
fdo#60924: move frm from scp2 to gbuild
Change-Id: I74232178bb8c8a528d03274fbc8c1c9573874421
diff --git a/Repository.mk b/Repository.mk
index 0967b62..e3a5a69 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -248,9 +248,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
dbaxml \
drawinglayer \
file \
+ frm \
sdbt \
odbcbase \
))
+
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
abp \
acc \
@@ -299,7 +301,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
flash \
flat \
for \
- frm \
fwe \
fwi \
fwk \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 5176d3a..c709fa7 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -560,8 +560,6 @@ End
#endif
-STD_LIB_FILE( gid_File_Lib_Frm , frm)
-
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
#ifdef WNT
commit 500aa64d6c2a3f413c2ae2de8e3a770f60c245db
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:42:23 2013 +0100
fdo#60924: move emser from scp2 to gbuild
Change-Id: Id90ffae1f38b69005ead8bef9fadc54833813184
diff --git a/Repository.mk b/Repository.mk
index 2d143ef..0967b62 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -226,6 +226,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
basctl \
))
endif
+ifeq ($(OS),WNT)
+ifeq ($(DISABLE_ATL),)
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+ emser \
+))
+endif
+endif
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
bib \
@@ -277,7 +285,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
editeng \
egi \
eme \
- emser \
epb \
epg \
epp \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index fdcb078..5176d3a 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -372,8 +372,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
#if defined(WNT) && !defined(DISABLE_ATL)
-STD_LIB_FILE( gid_File_Lib_Emser, emser )
-
File gid_File_Lib_Inprocserv
LIB_FILE_BODY;
Styles = (PACKED);
commit d6e09503f77f5077ff2df7972e123b74135291b6
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:40:31 2013 +0100
fdo#60924: move drawinglayer from scp2 to gbuild
Change-Id: I198238f52b232dab4dc1d39fff70eb2dda2ddcfd
diff --git a/Repository.mk b/Repository.mk
index 4a14143..2d143ef 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -238,6 +238,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
dbmm \
dbtools \
dbaxml \
+ drawinglayer \
file \
sdbt \
odbcbase \
@@ -273,7 +274,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
dbu \
deploymentmisc \
desktop_detector \
- drawinglayer \
editeng \
egi \
eme \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 8bca0e6..fdcb078 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -363,8 +363,6 @@ End
#endif
-STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
-
SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
/* fdo#60491 always need emboleobj library on non-WNT platforms */
commit 3cd951edd6588dc4ddd73013fba63caf1f44eeb0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:39:59 2013 +0100
fdo#60924: move dbaxml from scp2 to gbuild
Change-Id: I4f5edb370a77e9d364e2b1df1271f20f99cef193
diff --git a/Repository.mk b/Repository.mk
index 45a24ce..4a14143 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -237,6 +237,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
dbase \
dbmm \
dbtools \
+ dbaxml \
file \
sdbt \
odbcbase \
@@ -268,7 +269,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basegfx \
calc \
cppcanvas \
- dbaxml \
dbp \
dbu \
deploymentmisc \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 88e870b..8bca0e6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -212,8 +212,6 @@ File gid_File_Lib_Dbpool
#endif
End
-STD_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
-
File gid_File_Lib_Dict_Ja
LIB_FILE_BODY;
#ifdef UNX
commit de8336cf29c814e24a077787b47880b1487b8ed8
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:39:32 2013 +0100
fdo#60924: move dbtools from scp2 to gbuild
Change-Id: I58ed1ba6992b413aad9aa39f77623371a3e7972e
diff --git a/Repository.mk b/Repository.mk
index 5450b7e..45a24ce 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -236,6 +236,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
dba \
dbase \
dbmm \
+ dbtools \
file \
sdbt \
odbcbase \
@@ -269,7 +270,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cppcanvas \
dbaxml \
dbp \
- dbtools \
dbu \
deploymentmisc \
desktop_detector \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index ca6df88..88e870b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -212,8 +212,6 @@ File gid_File_Lib_Dbpool
#endif
End
-STD_LIB_FILE( gid_File_Lib_Dbt, dbtools )
-
STD_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
File gid_File_Lib_Dict_Ja
commit e487f8798bba6acdef2c504a7a293c52380b5f4d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:38:59 2013 +0100
fdo#60924: move odbcbase from scp2 to gbuild
Change-Id: I9e26a6a32a70275174c83d109256dde5c718e42b
diff --git a/Repository.mk b/Repository.mk
index c659d5f..5450b7e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -234,10 +234,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
ctl \
cui \
dba \
- dbmm \
- sdbt \
dbase \
+ dbmm \
file \
+ sdbt \
+ odbcbase \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
abp \
@@ -257,7 +258,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
evtatt \
forui \
odbc \
- odbcbase \
oox \
ooxml \
sdbc \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a81f336..ca6df88 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -201,9 +201,6 @@ End
#endif
#endif
-STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
-
-
File gid_File_Lib_Dbpool
LIB_FILE_BODY;
Styles = (PACKED);
commit c1dda9595db38ddbb0632c775b4cc02a806550fd
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:37:55 2013 +0100
fdo#60924: move file from scp2 to gbuild
Change-Id: Ia75627e720f1edf7dba8aeb4684cdc0e3bfebb33
diff --git a/Repository.mk b/Repository.mk
index 51607e9..c659d5f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -237,6 +237,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
dbmm \
sdbt \
dbase \
+ file \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
abp \
@@ -286,7 +287,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
eti \
evoab \
exp \
- file \
filterconfig \
filtertracer \
flash \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 992216a..a81f336 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -201,7 +201,6 @@ End
#endif
#endif
-STD_LIB_FILE( gid_File_Lib_Dbfile , file)
STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
commit 8994165fc57382815e173d7ae3e55a6719f80dc6
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:37:29 2013 +0100
fdo#60924: move dbase from scp2 to gbuild
Change-Id: I3d0f0320fff1e9b6609bac152ff27552d58d928f
diff --git a/Repository.mk b/Repository.mk
index 74bf56c..51607e9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -236,6 +236,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
dba \
dbmm \
sdbt \
+ dbase \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
abp \
@@ -265,7 +266,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basegfx \
calc \
cppcanvas \
- dbase \
dbaxml \
dbp \
dbtools \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 9b4f429..992216a 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -201,8 +201,6 @@ End
#endif
#endif
-STD_LIB_FILE( gid_File_Lib_Dbase2, dbase )
-
STD_LIB_FILE( gid_File_Lib_Dbfile , file)
STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
commit dfb3453e13af7a8b9de54bdd43f308663003f4c0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:35:52 2013 +0100
fdo#60924: move dbmm from scp2 to gbuild
Change-Id: Ibe4c7753c1494cc665f52cefcc65875fd75fe051
diff --git a/Repository.mk b/Repository.mk
index fa90def..74bf56c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -234,6 +234,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
ctl \
cui \
dba \
+ dbmm \
sdbt \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
@@ -266,7 +267,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cppcanvas \
dbase \
dbaxml \
- dbmm \
dbp \
dbtools \
dbu \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 2f8b7ae..9b4f429 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -201,8 +201,6 @@ End
#endif
#endif
-STD_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
-
STD_LIB_FILE( gid_File_Lib_Dbase2, dbase )
STD_LIB_FILE( gid_File_Lib_Dbfile , file)
commit 932f321a2d1c3a8629a63ca705828daaa363e762
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:35:15 2013 +0100
fdo#60924: move sdbt from scp2 to gbuild
Change-Id: Ib5ac31222fb9007336e49b872719c4515d51d5ad
diff --git a/Repository.mk b/Repository.mk
index fb66664..fa90def 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -234,6 +234,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
ctl \
cui \
dba \
+ sdbt \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
abp \
@@ -348,7 +349,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
scn \
scui \
sd \
- sdbt \
sdd \
sdfilt \
sdui \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a7c8302..2f8b7ae 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -201,8 +201,6 @@ End
#endif
#endif
-STD_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
-
STD_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
STD_LIB_FILE( gid_File_Lib_Dbase2, dbase )
commit 4c70c7954d785e83c4b599f605507d0c6fd58ef5
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:34:48 2013 +0100
fdo#60924: move dba from scp2 to gbuild
Change-Id: Iee64a80118e927bfa66d24edb34187f7f7551533
diff --git a/Repository.mk b/Repository.mk
index f060b31..fb66664 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -233,6 +233,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
chartcontroller \
ctl \
cui \
+ dba \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
abp \
@@ -262,7 +263,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basegfx \
calc \
cppcanvas \
- dba \
dbase \
dbaxml \
dbmm \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 05e9c15..a7c8302 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -201,8 +201,6 @@ End
#endif
#endif
-STD_LIB_FILE( gid_File_Lib_Dba, dba)
-
STD_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
STD_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
commit e9bb65ca3f04af009e96e6e1c9cbffdd27670d61
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:34:07 2013 +0100
fdo#60924: move cui from scp2 to gbuild
Change-Id: Iff0150f99336c9650c9d9a9aaf34d0badf32c562
diff --git a/Repository.mk b/Repository.mk
index 49a08c7..f060b31 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -232,6 +232,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
chartcore \
chartcontroller \
ctl \
+ cui \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
abp \
@@ -261,7 +262,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basegfx \
calc \
cppcanvas \
- cui \
dba \
dbase \
dbaxml \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 55fd2d9..05e9c15 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -165,8 +165,6 @@ File gid_File_Lib_Comphelper2
Styles = (PACKED);
End
-STD_LIB_FILE( gid_File_Lib_Cui, cui)
-
#ifndef SYSTEM_CURL
File gid_File_Lib_Curl
commit bece6c3a556e29f614b104a5d90882f73242cada
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:33:39 2013 +0100
fdo#60924: move ctl from scp2 to gbuild
Change-Id: If2b1df2e71f6f206bff0951205490283e481c199
diff --git a/Repository.mk b/Repository.mk
index 7d7cb6c..49a08c7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -231,6 +231,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
bib \
chartcore \
chartcontroller \
+ ctl \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
abp \
@@ -260,7 +261,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basegfx \
calc \
cppcanvas \
- ctl \
cui \
dba \
dbase \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1afbb21..55fd2d9 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -165,8 +165,6 @@ File gid_File_Lib_Comphelper2
Styles = (PACKED);
End
-STD_LIB_FILE( gid_File_Lib_Ctl , ctl)
-
STD_LIB_FILE( gid_File_Lib_Cui, cui)
#ifndef SYSTEM_CURL
commit afab854df6b704d45404826302d048d8b706e4d9
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:30:39 2013 +0100
fdo#60924: move chartcore from scp2 to gbuild
Change-Id: I6619cb27b1e49eb4ee7a91ad5e6f09f2b617e514
diff --git a/Repository.mk b/Repository.mk
index bec29e4..7d7cb6c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -229,6 +229,7 @@ endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
bib \
+ chartcore \
chartcontroller \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
@@ -258,7 +259,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
avmediaQuickTime \
basegfx \
calc \
- chartcore \
cppcanvas \
ctl \
cui \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 346c62b..1afbb21 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -103,9 +103,6 @@ File gid_File_Lib_Ldapbe2
#endif
End
-STD_LIB_FILE(gid_File_Lib_Chartcore, chartcore)
-
-
#if defined _MSC_VER
File gid_File_Lib_Cli_Oootypes_Assembly
commit 95e8e17558f6571981ccba9b2f0e90f1bbf07efa
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:29:42 2013 +0100
fdo#60924: move chartcontroller from scp2 to gbuild
Change-Id: Ifba88d55c6fa9f86d46b2460aca9d62e0d47fee7
diff --git a/Repository.mk b/Repository.mk
index c965b8d..bec29e4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -229,6 +229,7 @@ endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
bib \
+ chartcontroller \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
abp \
@@ -257,7 +258,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
avmediaQuickTime \
basegfx \
calc \
- chartcontroller \
chartcore \
cppcanvas \
ctl \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 79e7ee9..346c62b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -103,7 +103,6 @@ File gid_File_Lib_Ldapbe2
#endif
End
-STD_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
STD_LIB_FILE(gid_File_Lib_Chartcore, chartcore)
commit e06f62edbe7df9cf90d09f0ad68269f6bed17ce7
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 25 15:05:56 2013 +0100
remove STD_FILTER_FILE -- its essentially the same as STD_LIB_FILE
Change-Id: I98019eabc170b638275531036012cf8812e7f43c
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index fd336d0..1b537aa 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -43,14 +43,12 @@
#ifdef UNX
#define LIBNAME(name) STRING(CONCAT4(lib,name,DLLPOSTFIX,UNXSUFFIX))
- #define FILTER_LIBNAME(name) LIBNAME(name)
#define EXENAME(name) STRING(name)
#define PROFILENAME(name) STRING(CONCAT2(name,rc))
#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
#define SPECIAL_COMPONENT_LIB_NAME(name) STRING(CONCAT2(name,UNXSUFFIX))
#else
#define LIBNAME(name) STRING(CONCAT3(name,DLLPOSTFIX,.dll))
- #define FILTER_LIBNAME(name) LIBNAME(name)
#define EXENAME(name) STRING(CONCAT2(name,.exe))
#define PROFILENAME(name) STRING(CONCAT2(name,.ini))
#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
@@ -120,12 +118,6 @@
Styles = (PACKED); \
End
-#define STD_FILTER_FILE(id,name) \
- File id \
- PACKED_LIB_FILE_BODY; \
- Name = FILTER_LIBNAME(name); \
- End
-
#define STD_FONTWIN_FILE(id,name,fontname) \
File id \
TXT_FILE_BODY; \
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index e768887..5c41056 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -55,7 +55,7 @@ STD_LIB_FILE( gid_File_Lib_Sc, sc)
STD_LIB_FILE( gid_File_Lib_Scui, scui)
-STD_FILTER_FILE( gid_File_Lib_Scfilt, scfilt)
+STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
STD_LIB_FILE( gid_File_Lib_Scd, scd)
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index ee58421..9476149 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -38,4 +38,4 @@ STD_LIB_FILE( gid_File_Lib_Flash, flash )
STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
-STD_FILTER_FILE( gid_File_Lib_WpftDraw, wpftdraw )
+STD_LIB_FILE( gid_File_Lib_WpftDraw, wpftdraw )
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 39362a7..a5c2eb9 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -334,53 +334,53 @@ File gid_File_Dtd_Toolbar
Name = "toolbar.dtd";
End
-STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
+STD_LIB_FILE( gid_File_Filter_Sdfilt, sdfilt)
-STD_FILTER_FILE( git_File_Filter_Svgio, svgio)
+STD_LIB_FILE( git_File_Filter_Svgio, svgio)
-STD_FILTER_FILE( gid_File_Filter_Eme, eme)
+STD_LIB_FILE( gid_File_Filter_Eme, eme)
-STD_FILTER_FILE( gid_File_Filter_Icg, icg)
+STD_LIB_FILE( gid_File_Filter_Icg, icg)
-STD_FILTER_FILE( gid_File_Filter_Egi, egi)
+STD_LIB_FILE( gid_File_Filter_Egi, egi)
-STD_FILTER_FILE( gid_File_Filter_Epb, epb)
+STD_LIB_FILE( gid_File_Filter_Epb, epb)
-STD_FILTER_FILE( gid_File_Filter_Epg, epg)
+STD_LIB_FILE( gid_File_Filter_Epg, epg)
-STD_FILTER_FILE( gid_File_Filter_Epp, epp)
+STD_LIB_FILE( gid_File_Filter_Epp, epp)
-STD_FILTER_FILE( gid_File_Filter_Eps, eps)
+STD_LIB_FILE( gid_File_Filter_Eps, eps)
-STD_FILTER_FILE( gid_File_Filter_Ept, ept)
+STD_LIB_FILE( gid_File_Filter_Ept, ept)
-STD_FILTER_FILE( gid_File_Filter_Era, era)
+STD_LIB_FILE( gid_File_Filter_Era, era)
-STD_FILTER_FILE( gid_File_Filter_Eti, eti)
+STD_LIB_FILE( gid_File_Filter_Eti, eti)
-STD_FILTER_FILE( gid_File_Filter_Exp, exp)
+STD_LIB_FILE( gid_File_Filter_Exp, exp)
-STD_FILTER_FILE( gid_File_Filter_Icd, icd)
+STD_LIB_FILE( gid_File_Filter_Icd, icd)
-STD_FILTER_FILE( gid_File_Filter_Idx, idx)
+STD_LIB_FILE( gid_File_Filter_Idx, idx)
-STD_FILTER_FILE( gid_File_Filter_Ime, ime)
+STD_LIB_FILE( gid_File_Filter_Ime, ime)
-STD_FILTER_FILE( gid_File_Filter_Ipb, ipb)
+STD_LIB_FILE( gid_File_Filter_Ipb, ipb)
-STD_FILTER_FILE( gid_File_Filter_Ipd, ipd)
+STD_LIB_FILE( gid_File_Filter_Ipd, ipd)
-STD_FILTER_FILE( gid_File_Filter_Ips, ips)
+STD_LIB_FILE( gid_File_Filter_Ips, ips)
-STD_FILTER_FILE( gid_File_Filter_Ipt, ipt)
+STD_LIB_FILE( gid_File_Filter_Ipt, ipt)
-STD_FILTER_FILE( gid_File_Filter_Ipx, ipx)
+STD_LIB_FILE( gid_File_Filter_Ipx, ipx)
-STD_FILTER_FILE( gid_File_Filter_Ira, ira)
+STD_LIB_FILE( gid_File_Filter_Ira, ira)
-STD_FILTER_FILE( gid_File_Filter_Itg, itg)
+STD_LIB_FILE( gid_File_Filter_Itg, itg)
-STD_FILTER_FILE( gid_File_Filter_Iti, iti)
+STD_LIB_FILE( gid_File_Filter_Iti, iti)
STD_RES_FILE( gid_File_Res_Eps, eps )
More information about the Libreoffice-commits
mailing list