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 645539B4A for ; Thu, 16 Feb 2012 16:27:14 +0000 (UTC) Received: (qmail 46355 invoked by uid 500); 16 Feb 2012 16:27:14 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 46332 invoked by uid 500); 16 Feb 2012 16:27:14 -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 46325 invoked by uid 99); 16 Feb 2012 16:27:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 16:27:14 +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; Thu, 16 Feb 2012 16:27:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 04C6023888CD; Thu, 16 Feb 2012 16:26:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1245066 - in /incubator/ooo/trunk/main: packimages/pack/makefile.mk postprocess/packcomponents/makefile.mk postprocess/packregistry/makefile.mk Date: Thu, 16 Feb 2012 16:26:47 -0000 To: ooo-commits@incubator.apache.org From: ydario@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120216162648.04C6023888CD@eris.apache.org> Author: ydario Date: Thu Feb 16 16:26:47 2012 New Revision: 1245066 URL: http://svn.apache.org/viewvc?rev=1245066&view=rev Log: i118923 - OS/2 port: minor build fix. Modified: incubator/ooo/trunk/main/packimages/pack/makefile.mk incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk incubator/ooo/trunk/main/postprocess/packregistry/makefile.mk Modified: incubator/ooo/trunk/main/packimages/pack/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/packimages/pack/makefile.mk?rev=1245066&r1=1245065&r2=1245066&view=diff ============================================================================== --- incubator/ooo/trunk/main/packimages/pack/makefile.mk (original) +++ incubator/ooo/trunk/main/packimages/pack/makefile.mk Thu Feb 16 16:26:47 2012 @@ -66,11 +66,19 @@ $(COMMONBIN)$/images_brand.zip: # generate the HiContrast icon set $(MISC)$/hicontrast.flag .PHONY : +.IF "$(GUI)"=="OS2" + touch $(MISC)$/hicontrast.flag +.ELSE $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@ +.ENDIF # unpack the classic icon set $(MISC)$/classic.flag : $(CLASSIC_TARBALL) +.IF "$(GUI)"=="OS2" + cd $(MISC) && tar zxf $(CLASSIC_TARBALL) && $(TOUCH) $(@:f) +.ELSE cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f) +.ENDIF .IF "$(GUI)"=="UNX" chmod -R g+w $(MISC)$/classic .ENDIF Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1245066&r1=1245065&r2=1245066&view=diff ============================================================================== --- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original) +++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Thu Feb 16 16:26:47 2012 @@ -342,11 +342,12 @@ my_components += adabas .IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \ "$(WITH_MOZILLA)" != "NO" my_components += mozab +.ELIF "$(OS)" == "OS2" .ELSE my_components += mozbootstrap .END -.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" +.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "OS2" my_components += desktopbe1 .END Modified: incubator/ooo/trunk/main/postprocess/packregistry/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packregistry/makefile.mk?rev=1245066&r1=1245065&r2=1245066&view=diff ============================================================================== --- incubator/ooo/trunk/main/postprocess/packregistry/makefile.mk (original) +++ incubator/ooo/trunk/main/postprocess/packregistry/makefile.mk Thu Feb 16 16:26:47 2012 @@ -315,10 +315,17 @@ MY_FILES_main += \ $(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \ $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu # Inet-wnt.xcu must come after Inet.xcu +.ELIF "$(GUIBASE)" == "os2" +MY_FILES_main += \ + $(MY_MOD)/org/openoffice/Inet-wnt.xcu \ + $(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \ + $(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \ + $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu + # Inet-wnt.xcu must come after Inet.xcu .ELSE ERROR : unknown-GUIBASE .END -.IF "$(OS)" == "WNT" || "$(OS)" == "LINUX" || \ +.IF "$(OS)" == "WNT" || "$(OS)" == "LINUX" || "$(OS)" == "OS2" || \ ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "NETBSD" MY_FILES_main += $(MY_MOD)/DataAccess/adabas.xcu .END @@ -471,7 +478,7 @@ MY_FILES_ogltrans = \ $(MY_MOD)/org/openoffice/Office/Impress-ogltrans.xcu .END -.IF "$(GUIBASE)" == "WIN" +.IF "$(GUIBASE)" == "WIN" || "$(GUIBASE)" == "os2" MY_XCDS += $(MISC)/forcedefault.xcd MY_DEPS_forcedefault = main MY_FILES_forcedefault = \