incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1290838 - in /incubator/ooo/trunk/main/scp2: inc/ source/canvas/ source/graphicfilter/ source/impress/ source/ooo/ source/python/
Date Sat, 18 Feb 2012 18:29:54 GMT
Author: ydario
Date: Sat Feb 18 18:29:53 2012
New Revision: 1290838

URL: http://svn.apache.org/viewvc?rev=1290838&view=rev
Log:
i118923 - OS/2 port: scp2 allow packaging of 8.3 shortened names.

Modified:
    incubator/ooo/trunk/main/scp2/inc/macros.inc
    incubator/ooo/trunk/main/scp2/source/canvas/canvascommons.scp
    incubator/ooo/trunk/main/scp2/source/canvas/vclcanvas.scp
    incubator/ooo/trunk/main/scp2/source/graphicfilter/file_graphicfilter.scp
    incubator/ooo/trunk/main/scp2/source/impress/file_impress.scp
    incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp
    incubator/ooo/trunk/main/scp2/source/ooo/common_brand_readme.scp
    incubator/ooo/trunk/main/scp2/source/ooo/directory_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/file_improvement.scp
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/file_resource_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/ooo_brand.scp
    incubator/ooo/trunk/main/scp2/source/ooo/profileitem_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/ure.scp
    incubator/ooo/trunk/main/scp2/source/ooo/ure_into_ooo.scp
    incubator/ooo/trunk/main/scp2/source/python/file_python.scp

Modified: incubator/ooo/trunk/main/scp2/inc/macros.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/inc/macros.inc?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/inc/macros.inc (original)
+++ incubator/ooo/trunk/main/scp2/inc/macros.inc Sat Feb 18 18:29:53 2012
@@ -73,6 +73,9 @@
 #define ALL_LANG_KEY(vident) \
         ALL_LANG(Key,vident)
 
+#ifdef OS2
+    #define UNXSUFFIX .dll
+#endif
 
 #ifdef UNX
     #ifdef MACOSX
@@ -111,7 +114,7 @@
 #define EXTRAFILENAME(name,lang)              STRING(CONCAT3(name,lang,.zip))
 #define CONFIGLANGFILENAME(name,lang,ext)     STRING(CONCAT4(name,lang,.,ext))
 
-#if defined WNT
+#if defined(WNT) || defined(OS2)
 #define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program
 #else
 #define SCP2_OOO_BIN_DIR gid_Dir_Program
@@ -528,7 +531,7 @@ End
 
 // ---------------------------------------
 
-#if defined WNT
+#if defined(WNT) || defined(OS2)
 #define SCP2_URE_DL_DIR gid_Dir_Ure_Bin
 #define SCP2_URE_DL_NORMAL(n) n ".dll"
 #define SCP2_URE_DL_BARE(n) n ".dll"

Modified: incubator/ooo/trunk/main/scp2/source/canvas/canvascommons.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/canvas/canvascommons.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/canvas/canvascommons.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/canvas/canvascommons.scp Sat Feb 18 18:29:53 2012
@@ -23,8 +23,16 @@
 
 #include "macros.inc"
 
+#ifdef OS2
+STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanva)
+STD_LIB_FILE(gid_File_Lib_CanvasTools, canvasto)
+
+SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfa)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simpleca)
+#else
 STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
 STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
 
 SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
 SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
+#endif

Modified: incubator/ooo/trunk/main/scp2/source/canvas/vclcanvas.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/canvas/vclcanvas.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/canvas/vclcanvas.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/canvas/vclcanvas.scp Sat Feb 18 18:29:53 2012
@@ -23,4 +23,8 @@
 
 #include "macros.inc"
 
+#ifdef OS2
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanva)
+#else
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno)
+#endif
\ No newline at end of file

Modified: incubator/ooo/trunk/main/scp2/source/graphicfilter/file_graphicfilter.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/graphicfilter/file_graphicfilter.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/graphicfilter/file_graphicfilter.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/graphicfilter/file_graphicfilter.scp Sat Feb 18 18:29:53
2012
@@ -32,5 +32,9 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Flash, flash )
 
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_Svg, svgfilte )
+#else
 STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
+#endif
 

Modified: incubator/ooo/trunk/main/scp2/source/impress/file_impress.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/impress/file_impress.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/impress/file_impress.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/impress/file_impress.scp Sat Feb 18 18:29:53 2012
@@ -24,7 +24,11 @@
 #include "macros.inc"
 
 File gid_File_Lib_Placeware
+#ifdef OS2
+    Name = LIBNAME(placewar);
+#else
     Name = LIBNAME(placeware);
+#endif
     PACKED_LIB_FILE_BODY;
 End
 

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=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp Sat Feb 18 18:29:53 2012
@@ -262,7 +262,7 @@ End
 
 // Link to basis
 
-#if defined WNT
+#if defined(WNT) || defined(OS2)
 File gid_Brand_File_BasisLink
    TXT_FILE_BODY;
    Dir = gid_Dir_Brand_Root;
@@ -369,12 +369,14 @@ File gid_Brand_File_Desktophelper_Txt
 End
 #endif
 
+#ifndef OS2
 File gid_Brand_File_Bin_Unoinfo
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(unoinfo);
     Styles = (PACKED);
 End
+#endif
 
 #ifdef WNT
 File gid_Brand_File_Bin_Unopkgcom
@@ -385,7 +387,7 @@ File gid_Brand_File_Bin_Unopkgcom
 End
 #endif
 
-#ifdef WNT
+#if defined(WNT) || defined(OS2)
 File gid_Brand_File_Bin_Unopkgexe
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -429,12 +431,14 @@ Unixlink gid_Brand_Unixlink_Unopkg
 End
 #endif
 
+#ifndef OS2
 File gid_Brand_File_Bin_Unopkg
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);
     Name = "unopkg.bin";
 End
+#endif
 
 #if defined WNT && \
     (defined M1310 || \
@@ -804,7 +808,7 @@ ProfileItem gid_Brand_Profileitem_Bootst
     Section = "Bootstrap";
     Order = 3;
     Key = "UserInstallation";
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
   #elif defined MACOSX
     Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
@@ -875,7 +879,7 @@ ProfileItem gid_Brand_Profileitem_Soffic
     Value = "${NATIVEPROGRESS}";
 End
 
-#ifdef WNT
+#if defined(WNT) || defined(OS2)
 ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
     ProfileID = gid_Brand_Profile_Soffice_Ini;
     ModuleID = gid_Module_Root_Brand;
@@ -889,7 +893,7 @@ ProfileItem gid_Brand_Profileitem_Soffic
 End
 #endif
 
-#ifdef WNT
+#if defined(WNT) || defined(OS2)
 ProfileItem gid_Brand_Profileitem_Soffice_Startlang
     ProfileID = gid_Brand_Profile_Soffice_Ini;
     ModuleID = gid_Module_Root_Brand;
@@ -921,7 +925,7 @@ ProfileItem gid_Brand_Profileitem_Versio
     Value = "<sourceid>";
 End
 
-#ifdef WNT
+#if defined(WNT) || defined(OS2)
 
 ProfileItem gid_Brand_Profileitem_Version_Productcode
     ProfileID = gid_Brand_Profile_Version_Ini;
@@ -934,7 +938,7 @@ End
 
 #endif
 
-#ifdef WNT
+#if defined(WNT) || defined(OS2)
 
 ProfileItem gid_Brand_Profileitem_Version_Upgradecode
     ProfileID = gid_Brand_Profile_Version_Ini;
@@ -1062,7 +1066,7 @@ ProfileItem gid_Brand_Profileitem_Fundam
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
     Section = "Bootstrap";
     Key = "OOO_BASE_DIR";
-#if defined WNT
+#if defined(WNT) || defined(OS2)
     Value = "${.link:${BRAND_BASE_DIR}/basis-link}";
 #else
     Value = "${BRAND_BASE_DIR}/basis-link";

Modified: incubator/ooo/trunk/main/scp2/source/ooo/common_brand_readme.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/common_brand_readme.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/common_brand_readme.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/common_brand_readme.scp Sat Feb 18 18:29:53 2012
@@ -31,7 +31,7 @@ File gid_Brand_File_Txt_License
   #ifdef UNX
     README_ALL_LANG(Name, LICENSE);
   #endif
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     README_TXT_ALL_LANG(Name, license, txt);
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
@@ -43,7 +43,7 @@ File gid_Brand_File_Txt_License_Html
   #ifdef UNX
     README_TXT_ALL_LANG(Name, LICENSE, html);
   #endif
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     README_TXT_ALL_LANG(Name, license, html);
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
@@ -55,7 +55,7 @@ File gid_Brand_File_License_License
   #ifdef UNX
     README_ALL_LANG(Name, LICENSE);
   #endif
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     README_TXT_ALL_LANG(Name, license, txt);
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
@@ -67,7 +67,7 @@ File gid_Brand_File_License_License_Html
   #ifdef UNX
     README_TXT_ALL_LANG(Name, LICENSE, html);
   #endif
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     README_TXT_ALL_LANG(Name, license, html);
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
@@ -79,7 +79,7 @@ File gid_Brand_File_Txt_Readme
   #ifdef UNX
     README_ALL_LANG(Name, README);
   #endif
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     README_TXT_ALL_LANG(Name, readme, txt);
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
@@ -91,7 +91,7 @@ File gid_Brand_File_Txt_Readme_Html
   #ifdef UNX
     README_TXT_ALL_LANG(Name, README, html);
   #endif
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     README_TXT_ALL_LANG(Name, readme, html);
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
@@ -103,7 +103,7 @@ File gid_Brand_File_Readme_Readme
   #ifdef UNX
     README_ALL_LANG(Name, README);
   #endif
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     README_TXT_ALL_LANG(Name, readme, txt);
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
@@ -115,7 +115,7 @@ File gid_Brand_File_Readme_Readme_Html
   #ifdef UNX
     README_TXT_ALL_LANG(Name, README, html);
   #endif
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     README_TXT_ALL_LANG(Name, readme, html);
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);

Modified: incubator/ooo/trunk/main/scp2/source/ooo/directory_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/directory_ooo.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/directory_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/directory_ooo.scp Sat Feb 18 18:29:53 2012
@@ -68,7 +68,7 @@ End
 #ifndef MACOSX
 Directory gid_Dir_Ooo_Openofficeorg
     ParentID = PREDEFINED_PROGDIR;
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     HostName = "${BASISROOTNAME}";
   #else
     HostName = "${UNIXBASISROOTNAME}";
@@ -78,12 +78,12 @@ End
 
 #ifndef MACOSX
 Directory gid_Dir_Ooo_Basis
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     ParentID = gid_Dir_Brand_Root;
   #else
     ParentID = gid_Dir_Ooo_Openofficeorg;
   #endif
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     HostName = "Basis";
   #else
     HostName = "basis${OOOBASEVERSION}";

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_improvement.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_improvement.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_improvement.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_improvement.scp Sat Feb 18 18:29:53 2012
@@ -33,5 +33,9 @@ End
 #endif
 
 #if defined(BUILD_SPECIAL)
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimp)
+#else
 STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement)
 #endif
+#endif

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Sat Feb 18 18:29:53 2012
@@ -30,7 +30,7 @@ File gid_File_Lib_Accessbridge
     Name = "java_uno_accessbridge.dll";
 End
 #endif
-#if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))||
defined(NETBSD) )
+#if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))||
defined(NETBSD) || defined(OS2) )
 STD_LIB_FILE( gid_File_Lib_Adabas, adabas)
 #endif
 
@@ -46,6 +46,8 @@ File gid_File_Lib_Basprov
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,UNXSUFFIX));
+  #elif defined OS2
+    Name = "basprov.dll";
   #else
     Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,.dll));
   #endif
@@ -57,6 +59,8 @@ File gid_File_Lib_Vbaevent
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
+  #elif defined OS2
+    Name = "vbaevent.dll";
   #else
     Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
   #endif
@@ -75,7 +79,11 @@ File gid_File_Lib_Cached1
   #endif
 End
 
+#ifdef OS2
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmg)
+#else
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno)
+#endif
 
 #ifdef WITH_LDAP
 File gid_File_Lib_Ldapbe2
@@ -90,10 +98,17 @@ File gid_File_Lib_Ldapbe2
 End
 #endif
 
+#ifdef OS2
+STD_LIB_FILE(gid_File_Lib_Chartcontroller, chartcon)
+STD_LIB_FILE(gid_File_Lib_Chartmodel, chartmod)
+STD_LIB_FILE(gid_File_Lib_Charttools, charttoo)
+STD_LIB_FILE(gid_File_Lib_Chartview, chartvie)
+#else
 STD_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
 STD_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
 STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
 STD_LIB_FILE(gid_File_Lib_Chartview, chartview)
+#endif
 
 
 #if defined WNT && defined _MSC
@@ -147,14 +162,20 @@ End
 
 
 #if ! defined WNT // no longer supported on Windows
+#ifdef OS2
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail )
+#else
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno )
 #endif
+#endif
 
 
 File gid_File_Lib_Comphelper2
     TXT_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT3(libcomphelp,COMID,UNXSUFFIX));
+  #elif defined OS2
+    Name = STRING(CONCAT2(comphelp,.dll));
   #else
     Name = STRING(CONCAT3(comphelp,COMID,.dll));
   #endif
@@ -255,6 +276,8 @@ File gid_File_Lib_Collator_Data
     TXT_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libcollator_data,UNXSUFFIX));
+  #elif defined OS2
+    Name = "collator.dll";
   #else
     Name = "collator_data.dll";
   #endif
@@ -266,6 +289,8 @@ File gid_File_Lib_Index_Data
     TXT_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libindex_data,UNXSUFFIX));
+  #elif defined OS2
+    Name = "index_da.dll";
   #else
     Name = "index_data.dll";
   #endif
@@ -277,6 +302,8 @@ File gid_File_Lib_Textconv_Dict
     TXT_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libtextconv_dict,UNXSUFFIX));
+  #elif defined OS2
+    Name = "textconv.dll";
   #else
     Name = "textconv_dict.dll";
   #endif
@@ -290,6 +317,8 @@ File gid_File_Lib_Dlgprov
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,UNXSUFFIX));
+  #elif defined OS2
+    Name = "dlgprov.dll";
   #else
     Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,.dll));
   #endif
@@ -301,6 +330,8 @@ File gid_File_Lib_Stringresource
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,UNXSUFFIX));
+  #elif defined OS2
+    Name = "stringre.dll";
   #else
     Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,.dll));
   #endif
@@ -312,6 +343,8 @@ File gid_File_Lib_Vbaobj
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(libvbaobj,DLLPOSTFIX,.uno,UNXSUFFIX));
+  #elif defined OS2
+    Name = "vbaobj.dll";
   #else
     Name = STRING(CONCAT4(vbaobj,DLLPOSTFIX,.uno,.dll));
   #endif
@@ -323,6 +356,8 @@ File gid_File_Lib_Vbaswobj
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX));
+  #elif defined(OS2)
+    Name = "vbaswobj.dll";
   #else
     Name = STRING(CONCAT3(vbaswobj,.uno,.dll));
   #endif
@@ -334,6 +369,8 @@ File gid_File_Lib_Vbamsforms
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT3(msforms,.uno,UNXSUFFIX));
+  #elif defined(OS2)
+    Name = "msforms.dll";
   #else
     Name = STRING(CONCAT3(msforms,.uno,.dll));
   #endif
@@ -345,6 +382,8 @@ File gid_File_Lib_Vbahelper
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX));
+  #elif defined OS2
+    Name = "vbahelp.dll";
   #else
     Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll));
   #endif
@@ -362,7 +401,7 @@ End
 
 #endif
 
-#ifdef WNT
+#if defined WNT || defined OS2
 
 File gid_File_Lib_Dtrans
     TXT_FILE_BODY;
@@ -373,14 +412,23 @@ End
 
 #endif
 
+#ifdef OS2
+STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawingl)
+#else
 STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
+#endif
+
 STD_LIB_FILE(gid_File_Lib_SvgIo,svgio)
 
 SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
 
 #ifndef DISABLE_ATL
+#ifdef OS2
+SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleob)
+#else
 SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
 #endif
+#endif
 
 #if defined(WNT) && !defined(DISABLE_ATL)
 
@@ -456,7 +504,11 @@ File gid_File_Lib_Filterconfig1
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
+#ifdef OS2
+    Name = "filterco.dll";
+#else
     Name = SPECIAL_NAME(filterconfig1);
+#endif
 End
 
 STD_LIB_FILE( gid_File_Lib_Flat, flat)
@@ -539,9 +591,13 @@ End
 #endif
 #endif
 
+#ifdef OS2
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_offi )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker )
+#else
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
-
+#endif
 
 #if (defined(ENABLE_CAIRO) && ! defined (SYSTEM_CAIRO))
 
@@ -568,7 +624,11 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Frm , frm)
 
+#ifdef OS2
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorag )
+#else
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
+#endif
 
 #ifdef WNT
 
@@ -605,9 +665,13 @@ File gid_File_Lib_Gdiplus
 End
 #endif
 
+#ifdef OS2
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwin )
+STD_LIB_FILE( gid_File_Lib_Helplinker, helplink)
+#else
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
-
 STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
+#endif
 
 File gid_File_Lib_I18npool
     TXT_FILE_BODY;
@@ -615,6 +679,8 @@ File gid_File_Lib_I18npool
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(i18npool.uno,UNXSUFFIX));
+  #elif defined OS2
+    Name = "i18npool.dll";
   #else
     Name = STRING(CONCAT2(i18npool.uno,.dll));
   #endif
@@ -626,6 +692,8 @@ File gid_File_Lib_I18nsearch
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(i18nsearch.uno,UNXSUFFIX));
+  #elif defined OS2
+    Name = "i18nsear.dll";
   #else
     Name = "i18nsearch.uno.dll";
   #endif
@@ -634,6 +702,8 @@ End
 File gid_File_Lib_I18nisolang
   #ifdef UNX
     Name = STRING(CONCAT4(libi18nisolang,ISOLANG_MAJOR,COMID,UNXSUFFIX));
+  #elif defined OS2
+    Name = "i18nisol.dll";
   #else
     Name = STRING(CONCAT4(i18nisolang,ISOLANG_MAJOR,COMID,.dll));
   #endif
@@ -644,6 +714,8 @@ File gid_File_Lib_I18nutil
     TXT_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT3(libi18nutil,COMID,UNXSUFFIX));
+  #elif defined OS2
+    Name = "i18nutil.dll";
   #else
     Name = STRING(CONCAT3(i18nutil,COMID,.dll));
   #endif
@@ -651,7 +723,11 @@ File gid_File_Lib_I18nutil
     Styles = (PACKED);
 End
 
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_I18npaper, i18npape)
+#else
 STD_LIB_FILE( gid_File_Lib_I18npaper, i18npaper)
+#endif
 
 #ifndef SYSTEM_ICU
 
@@ -782,6 +858,8 @@ File gid_File_Lib_Localedata_En
     TXT_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(liblocaledata_en,UNXSUFFIX));
+  #elif defined OS2
+    Name = "ld_en.dll";
   #else
     Name = "localedata_en.dll";
   #endif
@@ -793,6 +871,8 @@ File gid_File_Lib_Localedata_Es
     TXT_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(liblocaledata_es,UNXSUFFIX));
+  #elif defined OS2
+    Name = "ld_es.dll";
   #else
     Name = "localedata_es.dll";
   #endif
@@ -804,6 +884,8 @@ File gid_File_Lib_Localedata_Euro
     TXT_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(liblocaledata_euro,UNXSUFFIX));
+  #elif defined OS2
+    Name = "ld_eur.dll";
   #else
     Name = "localedata_euro.dll";
   #endif
@@ -815,6 +897,8 @@ File gid_File_Lib_Localedata_Others
     TXT_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(liblocaledata_others,UNXSUFFIX));
+  #elif defined OS2
+    Name = "ld_oth.dll";
   #else
     Name = "localedata_others.dll";
   #endif
@@ -840,6 +924,7 @@ STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozab
 
 #else
 
+#ifndef OS2
 File gid_File_Lib_Mozbootstrap
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -850,6 +935,7 @@ File gid_File_Lib_Mozbootstrap
     Name = "mozbootstrap.dll";
   #endif
 End
+#endif
 
 #endif
 
@@ -857,9 +943,13 @@ End
 STD_LIB_FILE(gid_File_Lib_Wpft,wpft)
 #endif
 
+#ifdef OS2
+STD_LIB_FILE(gid_File_Lib_T602Filter,t602filt)
+STD_LIB_FILE(gid_File_Lib_Writerfilter,wfilt)
+#else
 STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
-
 STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
+#endif
 
 #ifdef WNT
 #if defined(_gcc3)
@@ -976,7 +1066,7 @@ STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
 STD_LIB_FILE( gid_File_Lib_Offacc, offacc)
 
 #ifdef SOLAR_JAVA
-#ifndef MACOSX
+#if !defined(MACOSX) && !defined(OS2)
 
 File gid_File_Lib_Officebean
     TXT_FILE_BODY;
@@ -1005,17 +1095,27 @@ End
 
 SPECIAL_LIB_FILE(gid_File_Lib_Package2,package2)
 
+#ifdef OS2
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, password )
+#else
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno )
+#endif
 
 STD_LIB_FILE( gid_File_Lib_Pcr, pcr)
 
 STD_LIB_FILE( gid_File_Lib_Log, log)
 
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilte)
+#else
 STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
+#endif
 
 File gid_File_Lib_Deployment
 #if defined UNX
     Name = STRING(CONCAT4(deployment,DLLPOSTFIX,.uno,UNXSUFFIX));
+#elif defined OS2
+    Name = "deploy.dll";
 #else
     Name = STRING(CONCAT3(deployment,DLLPOSTFIX,.uno.dll));
 #endif
@@ -1025,19 +1125,29 @@ End
 File gid_File_Lib_DeploymentGui
 #if defined UNX
     Name = STRING(CONCAT4(deploymentgui,DLLPOSTFIX,.uno,UNXSUFFIX));
+#elif defined OS2
+    Name = "deplgui.dll";
 #else
     Name = STRING(CONCAT3(deploymentgui,DLLPOSTFIX,.uno.dll));
 #endif
     PACKED_LIB_FILE_BODY;
 End
 
+#ifdef OS2
+STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deplmisc)
+#else
 STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
+#endif
 
 #ifndef WITHOUT_MOZILLA
 STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_Preload, preloadg)
+#else
 STD_LIB_FILE( gid_File_Lib_Preload, preload)
+#endif
 
 #if defined(UNX) && ! defined(QUARTZ)
 File gid_File_Lib_Desktop_Detector
@@ -1165,6 +1275,8 @@ File gid_File_Lib_Sax_Uno
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(sax.uno,UNXSUFFIX));
+  #elif defined(OS2)
+    Name = "sax_uno.dll";
   #else
     Name = "sax.uno.dll";
   #endif
@@ -1176,6 +1288,8 @@ File gid_File_Lib_Fastsax_Uno
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(fastsax.uno,UNXSUFFIX));
+  #elif defined(OS2)
+    Name = "fastsax.dll";
   #else
     Name = "fastsax.uno.dll";
   #endif
@@ -1197,6 +1311,8 @@ File gid_File_Lib_Scriptframe
     #else
        Name = "libscriptframe.so";
     #endif
+  #elif defined OS2
+    Name = "scriptfr.dll";
   #else
     Name = "scriptframe.dll";
   #endif
@@ -1213,6 +1329,8 @@ File gid_File_Lib_Slideshow
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(slideshow.uno,UNXSUFFIX));
+  #elif defined OS2
+    Name = "slidesho.dll";
   #else
     Name = "slideshow.uno.dll";
   #endif
@@ -1231,7 +1349,11 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Sdd , sdd)
 
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocol )
+#else
 STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
+#endif
 
 File gid_File_Lib_Sfx
     Name = LIBNAME(sfx);
@@ -1295,7 +1417,11 @@ STD_LIB_FILE( gid_File_Lib_Svtools, svt 
 
 STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
 STD_LIB_FILE( gid_File_Lib_Svx, svx)
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, txcnvdlg)
+#else
 STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
+#endif
 STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
 
 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
@@ -1310,16 +1436,25 @@ File gid_File_Lib_Sysdtrans
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
+#ifdef OS2
+    Name = "sysdtran.dll";
+#else
     Name = "sysdtrans.dll";
+#endif
 End
 #endif
 
+#ifdef OS2
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe )
+#else
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno )
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno )
 
 #ifdef WNT
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
 #endif
+#endif
 
 #ifdef MACOSX
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
@@ -1358,6 +1493,8 @@ File gid_File_Lib_Ucbhelper
     Styles = (PACKED);
   #ifdef UNX
     Name = STRING(CONCAT3(libucbhelper4,COMID,UNXSUFFIX));
+  #elif defined OS2
+    Name = "ucbh4.dll";
   #else
     Name = STRING(CONCAT3(ucbhelper4,COMID,.dll));
   #endif
@@ -1367,6 +1504,8 @@ File gid_File_Lib_Ucpchelp1
     TXT_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libucpchelp1,UNXSUFFIX));
+  #elif defined OS2
+    Name = "ucpchelp.dll";
   #else
     Name = "ucpchelp1.dll";
   #endif
@@ -1386,11 +1525,15 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ucphier1,u
 
 SPECIAL_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
 
+#ifdef OS2
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpan)
+#else
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno)
-
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
-
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
+#endif
 
 File gid_File_Lib_Lnth
     TXT_FILE_BODY;
@@ -1566,6 +1709,8 @@ File gid_File_Lib_Migrationoo2
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(migrationoo2.uno,UNXSUFFIX));
+  #elif defined OS2
+    Name = "migroo2.dll";
   #else
     Name = "migrationoo2.uno.dll";
   #endif
@@ -1578,18 +1723,24 @@ File gid_File_Lib_Libtextcat
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libtextcat,UNXSUFFIX));
+  #elif defined OS2
+    Name = "libtextc.dll";
   #else
     Name = "libtextcat.dll";
   #endif
 End
 #endif
 
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_Guesslang, guesslan )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefe )
+#else
 STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
+#endif
 
 STD_LIB_FILE( gid_File_Lib_Updchkui , updchk )
 
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
-
 #ifdef WNT
 File gid_File_Lib_Onlinecheck
     BIN_FILE_BODY;
@@ -1625,18 +1776,30 @@ End
 File gid_File_Lib_Soffice
     TXT_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_NORMAL("sofficea");
+#else
     Name = SCP2_URE_DL_NORMAL("sofficeapp");
+#endif
     Styles = (PACKED);
 End
 
 File gid_File_Lib_Unopkgapp
     TXT_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
+#ifdef OS2
+    Name = "unopkgap.dll";
+#else
     Name = SCP2_URE_DL_NORMAL("unopkgapp");
+#endif
     Styles = (PACKED);
 End
 
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimpc)
+#else
 STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
+#endif
 
 #if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined
WITHOUT_MOZILLA && \
     !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
@@ -1667,6 +1830,8 @@ File gid_File_Lib_Raptor
     #else
        Name = STRING(CONCAT4(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR));
     #endif
+  #elif defined(OS2)
+    Name = "raptor.dll";
   #else
    #ifdef _gcc3
     Name = "libraptor-1.dll";
@@ -1686,6 +1851,8 @@ File gid_File_Lib_Rasqal
     #else
        Name = STRING(CONCAT4(librasqal,UNXSUFFIX,.,RASQAL_MAJOR));
     #endif
+  #elif defined(OS2)
+    Name = "rasqal.dll";
   #else
    #ifdef _gcc3
        Name = STRING(CONCAT3(librasqal-,RASQAL_MAJOR,.dll));
@@ -1705,6 +1872,8 @@ File gid_File_Lib_Rdf
     #else
        Name = STRING(CONCAT4(librdf,UNXSUFFIX,.,REDLAND_MAJOR));
     #endif
+  #elif defined(OS2)
+    Name = "librdf.dll";
   #else
    #ifdef _gcc3
     Name = "librdf-0.dll";

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_resource_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_resource_ooo.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_resource_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_resource_ooo.scp Sat Feb 18 18:29:53 2012
@@ -53,8 +53,13 @@ STD_RES_FILE( gid_File_Res_Gal, gal )
 
 STD_RES_FILE( gid_File_Res_Imp, imp )
 
+#ifdef OS2
+STD_RES_FILE( gid_File_Res_Deployment, deploy )
+STD_RES_FILE( gid_File_Res_DeploymentGui, deplgui )
+#else
 STD_RES_FILE( gid_File_Res_Deployment, deployment )
 STD_RES_FILE( gid_File_Res_DeploymentGui, deploymentgui )
+#endif
 
 STD_RES_FILE( gid_File_Res_Ofa, ofa )
 

Modified: incubator/ooo/trunk/main/scp2/source/ooo/ooo_brand.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/ooo_brand.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/ooo_brand.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/ooo_brand.scp Sat Feb 18 18:29:53 2012
@@ -26,7 +26,7 @@
 #ifndef MACOSX
 Directory gid_Dir_Brand_Root
     ParentID = PREDEFINED_PROGDIR;
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
   #else
     HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";

Modified: incubator/ooo/trunk/main/scp2/source/ooo/profileitem_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/profileitem_ooo.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/profileitem_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/profileitem_ooo.scp Sat Feb 18 18:29:53 2012
@@ -412,7 +412,7 @@ ProfileItem gid_Profileitem_Fundamentalb
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
     Section = "Bootstrap";
     Key = "URE_BIN_DIR";
-#if defined WNT
+#if defined(WNT) || defined(OS2)
     Value = "${.link:$ORIGIN/../ure-link}/bin";
 #else
     Value = "$ORIGIN/../ure-link/bin";
@@ -424,7 +424,7 @@ ProfileItem gid_Profileitem_Fundamentalb
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
     Section = "Bootstrap";
     Key = "URE_LIB_DIR";
-#if defined WNT
+#if defined(WNT) || defined(OS2)
     Value = "${.link:$ORIGIN/../ure-link}/bin";
 #else
     Value = "$ORIGIN/../ure-link/lib";

Modified: incubator/ooo/trunk/main/scp2/source/ooo/ure.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/ure.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/ure.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/ure.scp Sat Feb 18 18:29:53 2012
@@ -32,7 +32,7 @@ Directory gid_Dir_Ure_Bin
     DosName = "bin";
 End
 
-#if !defined WNT
+#if !defined(WNT) && !defined(OS2)
 Directory gid_Dir_Ure_Lib
 #if defined MACOSX
     ParentID = gid_Dir_UreLink;
@@ -43,7 +43,7 @@ Directory gid_Dir_Ure_Lib
 End
 #endif
 
-#if !defined WNT
+#if !defined(WNT) && !defined(OS2)
 Directory gid_Dir_Ure_Share
 #if defined MACOSX
     ParentID = gid_Dir_UreLink;
@@ -78,7 +78,7 @@ File gid_File_Exe_Uno
 End
 #endif
 
-#ifndef WNT
+#if !defined(WNT) && !defined(OS2)
 Shortcut gid_Shortcut_Exe_Uno
     FileID = gid_File_Exe_StartupSh;
     Dir = gid_Dir_Ure_Bin;
@@ -122,7 +122,7 @@ File gid_File_Exe_Regview
     // CompID = "DAB09DCD-8491-4DC8-B153-2BA81A830AC2";
 End
 
-#if !defined MACOSX && !defined WNT && defined SOLAR_JAVA
+#if !defined MACOSX && !defined WNT && defined SOLAR_JAVA && !defined
OS2
 File gid_File_Exe_Javaldx
     BIN_FILE_BODY;
     Dir = gid_Dir_Ure_Bin;
@@ -134,7 +134,7 @@ End
 
 // Private Executables:
 
-#if !defined WNT
+#if !defined(WNT) && !defined(OS2)
 File gid_File_Exe_StartupSh
     BIN_FILE_BODY;
     Dir = gid_Dir_Ure_Bin;
@@ -144,7 +144,7 @@ File gid_File_Exe_StartupSh
 End
 #endif
 
-#if !defined WNT
+#if !defined(WNT) && !defined(OS2)
 File gid_File_Exe_UnoBin
     BIN_FILE_BODY;
     Dir = gid_Dir_Ure_Bin;
@@ -154,7 +154,7 @@ File gid_File_Exe_UnoBin
 End
 #endif
 
-#if !defined WNT
+#if !defined(WNT) && !defined(OS2)
 File gid_File_Exe_RegcompBin
     BIN_FILE_BODY;
     Dir = gid_Dir_Ure_Bin;
@@ -245,7 +245,11 @@ End
 File gid_File_Dl_Cppuhelper
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = "cppuh3.dll";
+#else
     Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "D2A191E6-2023-41F5-9032-B98C50C37964";
 End
@@ -253,7 +257,11 @@ End
 File gid_File_Dl_PurpEnvHelper
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = "purpeh3.dll";
+#else
     Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "C80146A8-A14C-44D1-AB9F-D9D8BF22277E";
 End
@@ -269,7 +277,11 @@ End
 File gid_File_Dl_Salhelper
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = "salhelp3.dll";
+#else
     Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "879B80E0-F6E1-4931-8EE6-7CF867CB6AA5";
 End
@@ -303,14 +315,22 @@ End
 File gid_File_Dl_Xmlreader
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_NORMAL("xmlreade");
+#else
     Name = SCP2_URE_DL_NORMAL("xmlreader");
+#endif
     Styles = (PACKED);
 End
 
 File gid_File_Dl_Jvmaccess
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = "jvmacces.dll";
+#else
     Name = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "F3D6F794-DA6F-4522-B3A7-C15593C1A577";
 End
@@ -327,7 +347,11 @@ End
 File gid_File_Dl_Sunjavaplugin
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = "sunjavap.dll";
+#else
     Name = SCP2_URE_DL_BARE("sunjavaplugin");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E";
 End
@@ -381,7 +405,11 @@ End
 File gid_File_Dl_UnsafeUnoUno
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = "unsafe_u.dll";
+#else
     Name = SCP2_URE_DL_NORMAL("unsafe_uno_uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "74C2909A-FDCF-430A-B0F4-CA6D15690D76";
 End
@@ -389,7 +417,11 @@ End
 File gid_File_Dl_AffineUnoUno
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_NORMAL("affine_u");
+#else
     Name = SCP2_URE_DL_NORMAL("affine_uno_uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "CF542EC3-7A51-4EAA-8480-65D5E8906D05";
 End
@@ -397,7 +429,11 @@ End
 File gid_File_Dl_LogUnoUno
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_NORMAL("log_uno_");
+#else
     Name = SCP2_URE_DL_NORMAL("log_uno_uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
@@ -653,7 +689,11 @@ End
 File gid_File_Dl_Acceptor
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("acceptor");
+#else
     Name = SCP2_URE_DL_BARE("acceptor.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "31183C51-C9A4-4D7A-A2F4-103252E1FEB0";
 End
@@ -661,14 +701,22 @@ End
 File gid_File_Dl_Binaryurp
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("binaryur");
+#else
     Name = SCP2_URE_DL_BARE("binaryurp.uno");
+#endif
     Styles = (PACKED);
 End
 
 File gid_File_Dl_Bootstrap
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("bootstra");
+#else
     Name = SCP2_URE_DL_BARE("bootstrap.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "2620B307-25DB-498F-B2B8-46D928165331";
 End
@@ -676,7 +724,11 @@ End
 File gid_File_Dl_Connector
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("connecto");
+#else
     Name = SCP2_URE_DL_BARE("connector.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "EBCE77E7-E244-40F6-96E2-5319D6571C5D";
 End
@@ -684,7 +736,11 @@ End
 File gid_File_Dl_Introspection
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("introspe");
+#else
     Name = SCP2_URE_DL_BARE("introspection.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "E99960CF-FE59-4332-A2AC-47418C3A17C1";
 End
@@ -692,7 +748,11 @@ End
 File gid_File_Dl_Invocadapt
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("invocada");
+#else
     Name = SCP2_URE_DL_BARE("invocadapt.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "77DDC112-1994-49D5-A086-FB16D4328AB9";
 End
@@ -700,7 +760,11 @@ End
 File gid_File_Dl_Invocation
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("invocati");
+#else
     Name = SCP2_URE_DL_BARE("invocation.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "A79ACB80-DA65-47CA-81BA-7CD9E191C84C";
 End
@@ -710,7 +774,11 @@ End
 File gid_File_Dl_Javaloader
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("javaload");
+#else
     Name = SCP2_URE_DL_BARE("javaloader.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "19A20968-E654-4E2C-9F58-7B66F07CA346";
 End
@@ -720,7 +788,11 @@ End
 File gid_File_Dl_Javavm
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("javavm");
+#else
     Name = SCP2_URE_DL_BARE("javavm.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "F1266B2B-80AD-4248-A921-9161759FA4DA";
 End
@@ -729,7 +801,11 @@ End
 File gid_File_Dl_Namingservice
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("namingse");
+#else
     Name = SCP2_URE_DL_BARE("namingservice.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "DD22BE3A-AD21-447D-B3A3-89B0FCDB0B31";
 End
@@ -737,7 +813,11 @@ End
 File gid_File_Dl_Stocservices
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("stocserv");
+#else
     Name = SCP2_URE_DL_BARE("stocservices.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "EBF6BBDE-EC50-4FB8-A0D4-BEC58F1C8C07";
 End
@@ -745,7 +825,11 @@ End
 File gid_File_Dl_Proxyfac
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("proxyfac");
+#else
     Name = SCP2_URE_DL_BARE("proxyfac.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "A2CDDEC3-B9C7-48C9-AB35-65008777BC2F";
 End
@@ -753,7 +837,11 @@ End
 File gid_File_Dl_Reflection
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("reflecti");
+#else
     Name = SCP2_URE_DL_BARE("reflection.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "601C7946-CFEB-4F56-9429-6D5963188DF3";
 End
@@ -761,7 +849,11 @@ End
 File gid_File_Dl_Streams
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("streams");
+#else
     Name = SCP2_URE_DL_BARE("streams.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "6028CF43-A9B7-40A8-8216-509CAB256A2B";
 End
@@ -769,7 +861,11 @@ End
 File gid_File_Dl_Textinstream
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("textinst");
+#else
     Name = SCP2_URE_DL_BARE("textinstream.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "DAA39D01-D9C5-40C4-94EC-9E4B2F94EABA";
 End
@@ -777,7 +873,11 @@ End
 File gid_File_Dl_Textoutstream
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("textouts");
+#else
     Name = SCP2_URE_DL_BARE("textoutstream.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "DD01EB0C-A119-43AE-9100-F7A595D099E4";
 End
@@ -785,7 +885,11 @@ End
 File gid_File_Dl_Uuresolver
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef OS2
+    Name = SCP2_URE_DL_BARE("uuresolv");
+#else
     Name = SCP2_URE_DL_BARE("uuresolver.uno");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "377090E1-5008-424F-B0F6-A9EFC9F11206";
 End
@@ -852,7 +956,7 @@ End
 #endif
 
 #if defined _gcc3 && !(defined NETBSD \
-	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(OS2))
 File gid_File_Dl_GccS
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -863,7 +967,7 @@ End
 #endif
 
 #if defined _gcc3 && !(defined NETBSD \
-	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(OS2))
 File gid_File_Dl_Stdcpp
     Dir = SCP2_URE_DL_DIR;
     TXT_FILE_BODY;

Modified: incubator/ooo/trunk/main/scp2/source/ooo/ure_into_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/ure_into_ooo.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/ure_into_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/ure_into_ooo.scp Sat Feb 18 18:29:53 2012
@@ -25,12 +25,12 @@
 
 #ifndef MACOSX
 Directory gid_Dir_Common_Ure
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     ParentID = gid_Dir_Brand_Root;
   #else
     ParentID = gid_Dir_Ooo_Openofficeorg;
   #endif
-  #ifdef WNT
+  #if defined(WNT) || defined(OS2)
     HostName = "URE";
   #else
     HostName = "ure";
@@ -39,7 +39,7 @@ Directory gid_Dir_Common_Ure
 End
 #endif
 
-#if defined WNT
+#if defined(WNT) || defined(OS2)
 File gid_File_UreLink
     TXT_FILE_BODY;
     Dir = gid_Dir_Ooo_Basis;

Modified: incubator/ooo/trunk/main/scp2/source/python/file_python.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/python/file_python.scp?rev=1290838&r1=1290837&r2=1290838&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/python/file_python.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/python/file_python.scp Sat Feb 18 18:29:53 2012
@@ -27,6 +27,8 @@ File gid_File_Lib_Pyuno
     TXT_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libpyuno,UNXSUFFIX));
+  #elif defined(OS2)
+    Name = "pyuno.dll";
   #else
     Name = "pyuno.pyd";
   #endif
@@ -39,6 +41,8 @@ File gid_File_Lib_Pythonloader
     Dir = gid_Dir_Program;
   #ifdef UNX
     Name = STRING(CONCAT2(pythonloader.uno,UNXSUFFIX));
+  #elif defined(OS2)
+    Name = "pythonlo.dll";
   #else
     Name = "pythonloader.uno.dll";
   #endif



Mime
View raw message