incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1355048 - in /incubator/ooo/trunk/main: desktop/source/deployment/gui/makefile.mk desktop/source/deployment/makefile.mk scp2/source/ooo/file_resource_ooo.scp
Date Thu, 28 Jun 2012 15:38:39 GMT
Author: ydario
Date: Thu Jun 28 15:38:38 2012
New Revision: 1355048

URL: http://svn.apache.org/viewvc?rev=1355048&view=rev
Log:
i118923 - OS/2 port: do not shorten names for resource files.

Modified:
    incubator/ooo/trunk/main/desktop/source/deployment/gui/makefile.mk
    incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk
    incubator/ooo/trunk/main/scp2/source/ooo/file_resource_ooo.scp

Modified: incubator/ooo/trunk/main/desktop/source/deployment/gui/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/deployment/gui/makefile.mk?rev=1355048&r1=1355047&r2=1355048&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/deployment/gui/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/deployment/gui/makefile.mk Thu Jun 28 15:38:38
2012
@@ -32,10 +32,6 @@ USE_PCH :=
 ENABLE_PCH :=
 PRJINC:=..$/..
 
-.IF "$(GUI)"=="OS2"
-TARGET = deplgui
-.ENDIF
-
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
 DLLPRE =
@@ -56,7 +52,7 @@ SLOFILES = \
         $(SLO)$/descedit.obj
 
 .IF "$(GUI)"=="OS2"
-SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
+SHL1TARGET = deplgui$(DLLPOSTFIX)
 .ELSE
 SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno
 .ENDIF

Modified: incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk?rev=1355048&r1=1355047&r2=1355048&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk Thu Jun 28 15:38:38 2012
@@ -29,10 +29,6 @@ ENABLE_EXCEPTIONS = TRUE
 #USE_DEFFILE = TRUE
 NO_BSYMBOLIC = TRUE
 
-.IF "$(GUI)"=="OS2"
-TARGET = deploy
-.ENDIF
-
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
 
@@ -41,7 +37,7 @@ INCPRE += inc
 DLLPRE =
 
 .IF "$(GUI)"=="OS2"
-SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
+SHL1TARGET = deploy$(DLLPOSTFIX)
 .ELSE
 SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno
 .ENDIF

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=1355048&r1=1355047&r2=1355048&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 Thu Jun 28 15:38:38 2012
@@ -53,13 +53,8 @@ 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 )
 



Mime
View raw message