Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4E0F3D37B for ; Tue, 19 Jun 2012 12:48:53 +0000 (UTC) Received: (qmail 99985 invoked by uid 500); 19 Jun 2012 12:48:53 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 99946 invoked by uid 500); 19 Jun 2012 12:48:52 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 99936 invoked by uid 99); 19 Jun 2012 12:48:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jun 2012 12:48:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jun 2012 12:48:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8B5462388EAE; Tue, 19 Jun 2012 12:48:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1351684 - in /incubator/ooo/trunk/main: RepositoryFixes.mk scp2/source/ooo/file_library_ooo.scp Date: Tue, 19 Jun 2012 12:48:30 -0000 To: ooo-commits@incubator.apache.org From: ydario@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120619124830.8B5462388EAE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ydario Date: Tue Jun 19 12:48:30 2012 New Revision: 1351684 URL: http://svn.apache.org/viewvc?rev=1351684&view=rev Log: i118923 - OS/2 port: rename sw.dll to swoo.dll, avoid mmos2 conflicts. Modified: incubator/ooo/trunk/main/RepositoryFixes.mk incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Modified: incubator/ooo/trunk/main/RepositoryFixes.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/RepositoryFixes.mk?rev=1351684&r1=1351683&r2=1351684&view=diff ============================================================================== --- incubator/ooo/trunk/main/RepositoryFixes.mk (original) +++ incubator/ooo/trunk/main/RepositoryFixes.mk Tue Jun 19 12:48:30 2012 @@ -194,6 +194,7 @@ gb_Library_FILENAMES := $(patsubst xslt: gb_Library_FILENAMES := $(patsubst stl:stl%,stl:stdc++%,$(gb_Library_FILENAMES)) # translate to 8.3 naming +gb_Library_DLLFILENAMES := $(patsubst sw:sw%,sw:swoo%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst drawinglayer:drawinglayer%,drawinglayer:drawingl%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst fsstorage:fsstorage.uno%,fsstorage:fsstorag%,$(gb_Library_DLLFILENAMES)) 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=1351684&r1=1351683&r2=1351684&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 Tue Jun 19 12:48:30 2012 @@ -1422,7 +1422,11 @@ STD_LIB_FILE( gid_File_Lib_Editeng, edit STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter) +#ifdef OS2 +STD_LIB_FILE( gid_File_Lib_Sw , swoo) +#else STD_LIB_FILE( gid_File_Lib_Sw , sw) +#endif STD_LIB_FILE( gid_File_Lib_Swui, swui) STD_LIB_FILE( gid_File_Lib_Msword, msword )