[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/source default_images/framework default_images/introabout odk/docs ooo_custom_images/dev ooo_custom_images/dev_nologo ooo_custom_images/nologo scp2/source setup_native/source
Yuri Dario
ydario at apache.org
Fri Feb 22 16:32:59 PST 2013
connectivity/source/drivers/mysql/makefile.mk | 4 ++++
connectivity/source/drivers/odbc/makefile.mk | 4 ++++
default_images/framework/res/backing.png |binary
default_images/framework/res/backing_hc.png |binary
default_images/introabout/about.png |binary
default_images/introabout/intro.png |binary
odk/docs/images/sdk_head-1.png |binary
ooo_custom_images/dev/introabout/intro.png |binary
ooo_custom_images/dev_nologo/introabout/intro.png |binary
ooo_custom_images/nologo/introabout/intro.png |binary
scp2/source/ooo/file_library_ooo.scp | 5 +++++
scp2/source/sdkoo/sdkoo.scp | 2 +-
setup_native/source/mac/ooo/DS_Store |binary
setup_native/source/mac/ooo/DS_Store_Dev |binary
setup_native/source/mac/ooo/DS_Store_Langpack |binary
setup_native/source/mac/ooo/osxdndinstall.png |binary
setup_native/source/mac/ooo/osxdndinstall_lang.png |binary
setup_native/source/mac/sdk/DS_Store_SDK |binary
setup_native/source/mac/sdk/osxdndinstall_sdk.png |binary
setup_native/source/win32/nsis/ooobitmap.bmp |binary
20 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 94d5f922c421c4def290dbdbcc16cc842ac510f0
Author: Yuri Dario <ydario at apache.org>
Date: Fri Feb 22 17:12:01 2013 +0000
i118923 - OS/2 port: use short names for mysql&odbc libraries.
diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk
index e6509b9..1664bbb 100644
--- a/connectivity/source/drivers/mysql/makefile.mk
+++ b/connectivity/source/drivers/mysql/makefile.mk
@@ -55,7 +55,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
# --- Library -----------------------------------
+.IF "$(GUI)" == "OS2"
+REALNAME:=$(MYSQL_TARGET)
+.ELSE
REALNAME:=$(MYSQL_TARGET).uno
+.ENDIF
SHL1TARGET=$(REALNAME)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
index dca329e..b03859b 100644
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -55,7 +55,11 @@ SLOFILES=\
# --- ODBC Library -----------------------------------
+.IF "$(GUI)" == "OS2"
+REALNAME:=$(ODBC_TARGET)
+.ELSE
REALNAME:=$(ODBC_TARGET).uno
+.ENDIF
SHL1TARGET=$(REALNAME)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 97374ee..0299e35 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1058,8 +1058,13 @@ End
#endif
#endif
+#if defined(OS2)
+STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
+STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
+#else
STD_LIB_FILE(gid_File_Lib_Mysql,mysql.uno)
STD_LIB_FILE(gid_File_Lib_Odbc,odbc.uno)
+#endif
// STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
commit b2980674b683a426a019ba475276f1fa4f52aa15
Author: Jürgen Schmidt <jsc at apache.org>
Date: Fri Feb 22 15:24:18 2013 +0000
#121388# add temporary adapted images for installer, intro, about
diff --git a/default_images/framework/res/backing.png b/default_images/framework/res/backing.png
index 44b6490..0f118ba 100644
Binary files a/default_images/framework/res/backing.png and b/default_images/framework/res/backing.png differ
diff --git a/default_images/framework/res/backing_hc.png b/default_images/framework/res/backing_hc.png
index cff04e5..1a4b8d0 100644
Binary files a/default_images/framework/res/backing_hc.png and b/default_images/framework/res/backing_hc.png differ
diff --git a/default_images/introabout/about.png b/default_images/introabout/about.png
index 12f9582..fb8f41c 100755
Binary files a/default_images/introabout/about.png and b/default_images/introabout/about.png differ
diff --git a/default_images/introabout/intro.png b/default_images/introabout/intro.png
index b635cc8..db31876 100755
Binary files a/default_images/introabout/intro.png and b/default_images/introabout/intro.png differ
diff --git a/odk/docs/images/sdk_head-1.png b/odk/docs/images/sdk_head-1.png
index 91f65b5..3dd9b1d 100644
Binary files a/odk/docs/images/sdk_head-1.png and b/odk/docs/images/sdk_head-1.png differ
diff --git a/ooo_custom_images/dev/introabout/intro.png b/ooo_custom_images/dev/introabout/intro.png
index 33c8ccb..c2975f0 100755
Binary files a/ooo_custom_images/dev/introabout/intro.png and b/ooo_custom_images/dev/introabout/intro.png differ
diff --git a/ooo_custom_images/dev_nologo/introabout/intro.png b/ooo_custom_images/dev_nologo/introabout/intro.png
index 33c8ccb..5b66665 100755
Binary files a/ooo_custom_images/dev_nologo/introabout/intro.png and b/ooo_custom_images/dev_nologo/introabout/intro.png differ
diff --git a/ooo_custom_images/nologo/introabout/intro.png b/ooo_custom_images/nologo/introabout/intro.png
index b635cc8..36f34bb 100755
Binary files a/ooo_custom_images/nologo/introabout/intro.png and b/ooo_custom_images/nologo/introabout/intro.png differ
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 968dd35..6ad99b5 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -70,7 +70,7 @@ End
Directory gid_Dir_Basis_Sdk
#if defined MACOSX
ParentID = PREDEFINED_PROGDIR;
- DosName = "Apache_OpenOffice_SDK";
+ DosName = "OpenOffice_SDK";
#else
#if defined WNT
ParentID = gid_Dir_Sdkoo_Root;
diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store
index dae0af0..81ef0ca 100644
Binary files a/setup_native/source/mac/ooo/DS_Store and b/setup_native/source/mac/ooo/DS_Store differ
diff --git a/setup_native/source/mac/ooo/DS_Store_Dev b/setup_native/source/mac/ooo/DS_Store_Dev
index 8e71b0e..94009db 100644
Binary files a/setup_native/source/mac/ooo/DS_Store_Dev and b/setup_native/source/mac/ooo/DS_Store_Dev differ
diff --git a/setup_native/source/mac/ooo/DS_Store_Langpack b/setup_native/source/mac/ooo/DS_Store_Langpack
index 21b08ff..b63ea63 100644
Binary files a/setup_native/source/mac/ooo/DS_Store_Langpack and b/setup_native/source/mac/ooo/DS_Store_Langpack differ
diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png
index 8b955d5..b7ac9d3 100644
Binary files a/setup_native/source/mac/ooo/osxdndinstall.png and b/setup_native/source/mac/ooo/osxdndinstall.png differ
diff --git a/setup_native/source/mac/ooo/osxdndinstall_lang.png b/setup_native/source/mac/ooo/osxdndinstall_lang.png
new file mode 100644
index 0000000..bbb99a3
Binary files /dev/null and b/setup_native/source/mac/ooo/osxdndinstall_lang.png differ
diff --git a/setup_native/source/mac/sdk/DS_Store_SDK b/setup_native/source/mac/sdk/DS_Store_SDK
index ee66b1b..26f09cb 100644
Binary files a/setup_native/source/mac/sdk/DS_Store_SDK and b/setup_native/source/mac/sdk/DS_Store_SDK differ
diff --git a/setup_native/source/mac/sdk/osxdndinstall_sdk.png b/setup_native/source/mac/sdk/osxdndinstall_sdk.png
index ce445d9..bbb99a3 100644
Binary files a/setup_native/source/mac/sdk/osxdndinstall_sdk.png and b/setup_native/source/mac/sdk/osxdndinstall_sdk.png differ
diff --git a/setup_native/source/win32/nsis/ooobitmap.bmp b/setup_native/source/win32/nsis/ooobitmap.bmp
index 8fc53c5..66807c1 100644
Binary files a/setup_native/source/win32/nsis/ooobitmap.bmp and b/setup_native/source/win32/nsis/ooobitmap.bmp differ
More information about the Libreoffice-commits
mailing list