You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by yd...@apache.org on 2012/03/02 21:03:13 UTC
svn commit: r1296424 - in /incubator/ooo/trunk/main/scp2/source:
onlineupdate/file_onlineupdate.scp ooo/common_brand.scp
Author: ydario
Date: Fri Mar 2 20:03:12 2012
New Revision: 1296424
URL: http://svn.apache.org/viewvc?rev=1296424&view=rev
Log:
i118923 - OS/2 port: correct packaging for unopkg.exe and online update dll.
Modified:
incubator/ooo/trunk/main/scp2/source/onlineupdate/file_onlineupdate.scp
incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp
Modified: incubator/ooo/trunk/main/scp2/source/onlineupdate/file_onlineupdate.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/onlineupdate/file_onlineupdate.scp?rev=1296424&r1=1296423&r2=1296424&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/onlineupdate/file_onlineupdate.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/onlineupdate/file_onlineupdate.scp Fri Mar 2 20:03:12 2012
@@ -23,7 +23,11 @@
#include "macros.inc"
+#ifdef OS2
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchkun )
+#else
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
+#endif
File gid_File_Share_Registry_Onlineupdate_Xcd
TXT_FILE_BODY;
Modified: incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp?rev=1296424&r1=1296423&r2=1296424&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp Fri Mar 2 20:03:12 2012
@@ -388,7 +388,7 @@ File gid_Brand_File_Bin_Unopkgcom
End
#endif
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
File gid_Brand_File_Bin_Unopkgexe
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
@@ -397,6 +397,15 @@ File gid_Brand_File_Bin_Unopkgexe
End
#endif
+#if defined(OS2)
+File gid_Brand_File_Bin_Unopkgexe
+ BIN_FILE_BODY;
+ Dir = gid_Brand_Dir_Program;
+ Styles = (PACKED);
+ Name = "unopkg.bin";
+End
+#endif
+
#ifdef WNT
File gid_Brand_File_Bin_Rebaseoo
BIN_FILE_BODY;