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/02/18 19:31:53 UTC
svn commit: r1290840 - in /incubator/ooo/trunk/main/solenv/inc: ./
startup/OS2/
Author: ydario
Date: Sat Feb 18 18:31:52 2012
New Revision: 1290840
URL: http://svn.apache.org/viewvc?rev=1290840&view=rev
Log:
i118923 - OS/2 port: solenv build system patches.
Modified:
incubator/ooo/trunk/main/solenv/inc/_tg_app.mk
incubator/ooo/trunk/main/solenv/inc/_tg_def.mk
incubator/ooo/trunk/main/solenv/inc/_tg_lib.mk
incubator/ooo/trunk/main/solenv/inc/_tg_shl.mk
incubator/ooo/trunk/main/solenv/inc/_tg_zip.mk
incubator/ooo/trunk/main/solenv/inc/os2.mk
incubator/ooo/trunk/main/solenv/inc/os2gcci.mk
incubator/ooo/trunk/main/solenv/inc/pstrules.mk
incubator/ooo/trunk/main/solenv/inc/settings.mk
incubator/ooo/trunk/main/solenv/inc/shlinfo.rc
incubator/ooo/trunk/main/solenv/inc/startup/OS2/macros.mk
incubator/ooo/trunk/main/solenv/inc/target.mk
incubator/ooo/trunk/main/solenv/inc/tg_app.mk
incubator/ooo/trunk/main/solenv/inc/tg_def.mk
incubator/ooo/trunk/main/solenv/inc/tg_ext.mk
incubator/ooo/trunk/main/solenv/inc/tg_lib.mk
incubator/ooo/trunk/main/solenv/inc/tg_shl.mk
incubator/ooo/trunk/main/solenv/inc/tg_yxx.mk
incubator/ooo/trunk/main/solenv/inc/tg_zip.mk
incubator/ooo/trunk/main/solenv/inc/unitools.mk
Modified: incubator/ooo/trunk/main/solenv/inc/_tg_app.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/_tg_app.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/_tg_app.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/_tg_app.mk Sat Feb 18 18:31:52 2012
@@ -219,11 +219,11 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP1LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP1LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP1LINKRES:b).rc > $(NULLDEV)
.IF "$(APP1ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP1ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP1LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP1ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP1LINKRES:b).rc
.ENDIF # "$(APP1ICON)" != ""
.IF "$(APP1VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc
@@ -236,22 +236,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS)
@echo NAME $(APP1TARGET) WINDOWAPI > $(MISC)/$(APP1TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP1LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP1BASEX) \
- $(APP1STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP1LINKRES) \
- $(APP1RES) \
- $(APP1DEF) \
- $(APP1OBJS) \
- $(APP1LIBS) \
- $(APP1STDLIBS:^"-l") \
- $(APP1STDLIB:^"-l") $(STDLIB1:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP1LINKER) -v \
$(APP1LINKFLAGS) \
$(LINKFLAGSAPP) $(APP1BASEX) \
@@ -265,8 +249,8 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS)
$(APP1DEF) \
$(APP1OBJS) \
$(APP1LIBS) \
- $(APP1STDLIBS:^"-l") \
- $(APP1STDLIB:^"-l") $(STDLIB1:^"-l")
+ $(APP1STDLIBS) \
+ $(APP1STDLIB) $(STDLIB1)
.IF "$(APP1TARGET)" == "loader"
@@ -503,11 +487,11 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP2LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP2LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP2LINKRES:b).rc > $(NULLDEV)
.IF "$(APP2ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP2ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP2LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP2ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP2LINKRES:b).rc
.ENDIF # "$(APP2ICON)" != ""
.IF "$(APP2VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc
@@ -520,22 +504,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS)
@echo NAME $(APP2TARGET) WINDOWAPI > $(MISC)/$(APP2TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP2LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP2BASEX) \
- $(APP2STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP2LINKRES) \
- $(APP2RES) \
- $(APP2DEF) \
- $(APP2OBJS) \
- $(APP2LIBS) \
- $(APP2STDLIBS:^"-l") \
- $(APP2STDLIB:^"-l") $(STDLIB2:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP2LINKER) -v \
$(APP2LINKFLAGS) \
$(LINKFLAGSAPP) $(APP2BASEX) \
@@ -549,8 +517,8 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS)
$(APP2DEF) \
$(APP2OBJS) \
$(APP2LIBS) \
- $(APP2STDLIBS:^"-l") \
- $(APP2STDLIB:^"-l") $(STDLIB2:^"-l")
+ $(APP2STDLIBS) \
+ $(APP2STDLIB) $(STDLIB2)
.IF "$(APP2TARGET)" == "loader"
@@ -787,11 +755,11 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP3LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP3LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP3LINKRES:b).rc > $(NULLDEV)
.IF "$(APP3ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP3ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP3LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP3ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP3LINKRES:b).rc
.ENDIF # "$(APP3ICON)" != ""
.IF "$(APP3VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc
@@ -804,22 +772,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS)
@echo NAME $(APP3TARGET) WINDOWAPI > $(MISC)/$(APP3TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP3LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP3BASEX) \
- $(APP3STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP3LINKRES) \
- $(APP3RES) \
- $(APP3DEF) \
- $(APP3OBJS) \
- $(APP3LIBS) \
- $(APP3STDLIBS:^"-l") \
- $(APP3STDLIB:^"-l") $(STDLIB3:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP3LINKER) -v \
$(APP3LINKFLAGS) \
$(LINKFLAGSAPP) $(APP3BASEX) \
@@ -833,8 +785,8 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS)
$(APP3DEF) \
$(APP3OBJS) \
$(APP3LIBS) \
- $(APP3STDLIBS:^"-l") \
- $(APP3STDLIB:^"-l") $(STDLIB3:^"-l")
+ $(APP3STDLIBS) \
+ $(APP3STDLIB) $(STDLIB3)
.IF "$(APP3TARGET)" == "loader"
@@ -1071,11 +1023,11 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP4LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP4LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP4LINKRES:b).rc > $(NULLDEV)
.IF "$(APP4ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP4ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP4LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP4ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP4LINKRES:b).rc
.ENDIF # "$(APP4ICON)" != ""
.IF "$(APP4VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc
@@ -1088,22 +1040,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS)
@echo NAME $(APP4TARGET) WINDOWAPI > $(MISC)/$(APP4TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP4LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP4BASEX) \
- $(APP4STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP4LINKRES) \
- $(APP4RES) \
- $(APP4DEF) \
- $(APP4OBJS) \
- $(APP4LIBS) \
- $(APP4STDLIBS:^"-l") \
- $(APP4STDLIB:^"-l") $(STDLIB4:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP4LINKER) -v \
$(APP4LINKFLAGS) \
$(LINKFLAGSAPP) $(APP4BASEX) \
@@ -1117,8 +1053,8 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS)
$(APP4DEF) \
$(APP4OBJS) \
$(APP4LIBS) \
- $(APP4STDLIBS:^"-l") \
- $(APP4STDLIB:^"-l") $(STDLIB4:^"-l")
+ $(APP4STDLIBS) \
+ $(APP4STDLIB) $(STDLIB4)
.IF "$(APP4TARGET)" == "loader"
@@ -1355,11 +1291,11 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP5LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP5LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP5LINKRES:b).rc > $(NULLDEV)
.IF "$(APP5ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP5ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP5LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP5ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP5LINKRES:b).rc
.ENDIF # "$(APP5ICON)" != ""
.IF "$(APP5VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc
@@ -1372,22 +1308,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS)
@echo NAME $(APP5TARGET) WINDOWAPI > $(MISC)/$(APP5TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP5LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP5BASEX) \
- $(APP5STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP5LINKRES) \
- $(APP5RES) \
- $(APP5DEF) \
- $(APP5OBJS) \
- $(APP5LIBS) \
- $(APP5STDLIBS:^"-l") \
- $(APP5STDLIB:^"-l") $(STDLIB5:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP5LINKER) -v \
$(APP5LINKFLAGS) \
$(LINKFLAGSAPP) $(APP5BASEX) \
@@ -1401,8 +1321,8 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS)
$(APP5DEF) \
$(APP5OBJS) \
$(APP5LIBS) \
- $(APP5STDLIBS:^"-l") \
- $(APP5STDLIB:^"-l") $(STDLIB5:^"-l")
+ $(APP5STDLIBS) \
+ $(APP5STDLIB) $(STDLIB5)
.IF "$(APP5TARGET)" == "loader"
@@ -1639,11 +1559,11 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP6LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP6LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP6LINKRES:b).rc > $(NULLDEV)
.IF "$(APP6ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP6ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP6LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP6ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP6LINKRES:b).rc
.ENDIF # "$(APP6ICON)" != ""
.IF "$(APP6VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc
@@ -1656,22 +1576,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS)
@echo NAME $(APP6TARGET) WINDOWAPI > $(MISC)/$(APP6TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP6LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP6BASEX) \
- $(APP6STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP6LINKRES) \
- $(APP6RES) \
- $(APP6DEF) \
- $(APP6OBJS) \
- $(APP6LIBS) \
- $(APP6STDLIBS:^"-l") \
- $(APP6STDLIB:^"-l") $(STDLIB6:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP6LINKER) -v \
$(APP6LINKFLAGS) \
$(LINKFLAGSAPP) $(APP6BASEX) \
@@ -1685,8 +1589,8 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS)
$(APP6DEF) \
$(APP6OBJS) \
$(APP6LIBS) \
- $(APP6STDLIBS:^"-l") \
- $(APP6STDLIB:^"-l") $(STDLIB6:^"-l")
+ $(APP6STDLIBS) \
+ $(APP6STDLIB) $(STDLIB6)
.IF "$(APP6TARGET)" == "loader"
@@ -1923,11 +1827,11 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP7LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP7LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP7LINKRES:b).rc > $(NULLDEV)
.IF "$(APP7ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP7ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP7LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP7ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP7LINKRES:b).rc
.ENDIF # "$(APP7ICON)" != ""
.IF "$(APP7VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc
@@ -1940,22 +1844,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS)
@echo NAME $(APP7TARGET) WINDOWAPI > $(MISC)/$(APP7TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP7LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP7BASEX) \
- $(APP7STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP7LINKRES) \
- $(APP7RES) \
- $(APP7DEF) \
- $(APP7OBJS) \
- $(APP7LIBS) \
- $(APP7STDLIBS:^"-l") \
- $(APP7STDLIB:^"-l") $(STDLIB7:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP7LINKER) -v \
$(APP7LINKFLAGS) \
$(LINKFLAGSAPP) $(APP7BASEX) \
@@ -1969,8 +1857,8 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS)
$(APP7DEF) \
$(APP7OBJS) \
$(APP7LIBS) \
- $(APP7STDLIBS:^"-l") \
- $(APP7STDLIB:^"-l") $(STDLIB7:^"-l")
+ $(APP7STDLIBS) \
+ $(APP7STDLIB) $(STDLIB7)
.IF "$(APP7TARGET)" == "loader"
@@ -2207,11 +2095,11 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP8LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP8LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP8LINKRES:b).rc > $(NULLDEV)
.IF "$(APP8ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP8ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP8LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP8ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP8LINKRES:b).rc
.ENDIF # "$(APP8ICON)" != ""
.IF "$(APP8VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc
@@ -2224,22 +2112,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS)
@echo NAME $(APP8TARGET) WINDOWAPI > $(MISC)/$(APP8TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP8LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP8BASEX) \
- $(APP8STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP8LINKRES) \
- $(APP8RES) \
- $(APP8DEF) \
- $(APP8OBJS) \
- $(APP8LIBS) \
- $(APP8STDLIBS:^"-l") \
- $(APP8STDLIB:^"-l") $(STDLIB8:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP8LINKER) -v \
$(APP8LINKFLAGS) \
$(LINKFLAGSAPP) $(APP8BASEX) \
@@ -2253,8 +2125,8 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS)
$(APP8DEF) \
$(APP8OBJS) \
$(APP8LIBS) \
- $(APP8STDLIBS:^"-l") \
- $(APP8STDLIB:^"-l") $(STDLIB8:^"-l")
+ $(APP8STDLIBS) \
+ $(APP8STDLIB) $(STDLIB8)
.IF "$(APP8TARGET)" == "loader"
@@ -2491,11 +2363,11 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP9LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP9LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP9LINKRES:b).rc > $(NULLDEV)
.IF "$(APP9ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP9ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP9LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP9ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP9LINKRES:b).rc
.ENDIF # "$(APP9ICON)" != ""
.IF "$(APP9VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc
@@ -2508,22 +2380,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS)
@echo NAME $(APP9TARGET) WINDOWAPI > $(MISC)/$(APP9TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP9LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP9BASEX) \
- $(APP9STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP9LINKRES) \
- $(APP9RES) \
- $(APP9DEF) \
- $(APP9OBJS) \
- $(APP9LIBS) \
- $(APP9STDLIBS:^"-l") \
- $(APP9STDLIB:^"-l") $(STDLIB9:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP9LINKER) -v \
$(APP9LINKFLAGS) \
$(LINKFLAGSAPP) $(APP9BASEX) \
@@ -2537,8 +2393,8 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS)
$(APP9DEF) \
$(APP9OBJS) \
$(APP9LIBS) \
- $(APP9STDLIBS:^"-l") \
- $(APP9STDLIB:^"-l") $(STDLIB9:^"-l")
+ $(APP9STDLIBS) \
+ $(APP9STDLIB) $(STDLIB9)
.IF "$(APP9TARGET)" == "loader"
@@ -2775,11 +2631,11 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIB
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP10LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP10LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP10LINKRES:b).rc > $(NULLDEV)
.IF "$(APP10ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP10ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP10LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP10ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP10LINKRES:b).rc
.ENDIF # "$(APP10ICON)" != ""
.IF "$(APP10VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc
@@ -2792,22 +2648,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIB
@echo NAME $(APP10TARGET) WINDOWAPI > $(MISC)/$(APP10TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP10LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP10BASEX) \
- $(APP10STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP10LINKRES) \
- $(APP10RES) \
- $(APP10DEF) \
- $(APP10OBJS) \
- $(APP10LIBS) \
- $(APP10STDLIBS:^"-l") \
- $(APP10STDLIB:^"-l") $(STDLIB10:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP10LINKER) -v \
$(APP10LINKFLAGS) \
$(LINKFLAGSAPP) $(APP10BASEX) \
@@ -2821,8 +2661,8 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIB
$(APP10DEF) \
$(APP10OBJS) \
$(APP10LIBS) \
- $(APP10STDLIBS:^"-l") \
- $(APP10STDLIB:^"-l") $(STDLIB10:^"-l")
+ $(APP10STDLIBS) \
+ $(APP10STDLIB) $(STDLIB10)
.IF "$(APP10TARGET)" == "loader"
Modified: incubator/ooo/trunk/main/solenv/inc/_tg_def.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/_tg_def.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/_tg_def.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/_tg_def.mk Sat Feb 18 18:31:52 2012
@@ -167,7 +167,7 @@ $(DEF1TARGETN) .PHONY :
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL1TARGET8=$(shell @fix_shl $(SHL1TARGETN:f))
+SHL1TARGET8=$(shell @fix_shl.cmd $(SHL1TARGETN:f))
DEF1FILTER=$(SOLARENV)/inc/dummy.flt
DEF1NAMELIST=$(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib)
@@ -183,7 +183,6 @@ $(DEF1TARGETN) .PHONY :
@echo "Making: module definition file" $(@:f)
@echo LIBRARY $(SHL1TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
@echo DATA MULTIPLE >>$@.tmpfile
- @echo DESCRIPTION 'StarView 3.00 $(DEF1DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
@@ -448,7 +447,7 @@ $(DEF2TARGETN) .PHONY :
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL2TARGET8=$(shell @fix_shl $(SHL2TARGETN:f))
+SHL2TARGET8=$(shell @fix_shl.cmd $(SHL2TARGETN:f))
DEF2FILTER=$(SOLARENV)/inc/dummy.flt
DEF2NAMELIST=$(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib)
@@ -464,7 +463,6 @@ $(DEF2TARGETN) .PHONY :
@echo "Making: module definition file" $(@:f)
@echo LIBRARY $(SHL2TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
@echo DATA MULTIPLE >>$@.tmpfile
- @echo DESCRIPTION 'StarView 3.00 $(DEF2DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
@@ -729,7 +727,7 @@ $(DEF3TARGETN) .PHONY :
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL3TARGET8=$(shell @fix_shl $(SHL3TARGETN:f))
+SHL3TARGET8=$(shell @fix_shl.cmd $(SHL3TARGETN:f))
DEF3FILTER=$(SOLARENV)/inc/dummy.flt
DEF3NAMELIST=$(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib)
@@ -745,7 +743,6 @@ $(DEF3TARGETN) .PHONY :
@echo "Making: module definition file" $(@:f)
@echo LIBRARY $(SHL3TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
@echo DATA MULTIPLE >>$@.tmpfile
- @echo DESCRIPTION 'StarView 3.00 $(DEF3DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
@@ -1010,7 +1007,7 @@ $(DEF4TARGETN) .PHONY :
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL4TARGET8=$(shell @fix_shl $(SHL4TARGETN:f))
+SHL4TARGET8=$(shell @fix_shl.cmd $(SHL4TARGETN:f))
DEF4FILTER=$(SOLARENV)/inc/dummy.flt
DEF4NAMELIST=$(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib)
@@ -1026,7 +1023,6 @@ $(DEF4TARGETN) .PHONY :
@echo "Making: module definition file" $(@:f)
@echo LIBRARY $(SHL4TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
@echo DATA MULTIPLE >>$@.tmpfile
- @echo DESCRIPTION 'StarView 3.00 $(DEF4DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
@@ -1291,7 +1287,7 @@ $(DEF5TARGETN) .PHONY :
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL5TARGET8=$(shell @fix_shl $(SHL5TARGETN:f))
+SHL5TARGET8=$(shell @fix_shl.cmd $(SHL5TARGETN:f))
DEF5FILTER=$(SOLARENV)/inc/dummy.flt
DEF5NAMELIST=$(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib)
@@ -1307,7 +1303,6 @@ $(DEF5TARGETN) .PHONY :
@echo "Making: module definition file" $(@:f)
@echo LIBRARY $(SHL5TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
@echo DATA MULTIPLE >>$@.tmpfile
- @echo DESCRIPTION 'StarView 3.00 $(DEF5DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
@@ -1572,7 +1567,7 @@ $(DEF6TARGETN) .PHONY :
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL6TARGET8=$(shell @fix_shl $(SHL6TARGETN:f))
+SHL6TARGET8=$(shell @fix_shl.cmd $(SHL6TARGETN:f))
DEF6FILTER=$(SOLARENV)/inc/dummy.flt
DEF6NAMELIST=$(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib)
@@ -1588,7 +1583,6 @@ $(DEF6TARGETN) .PHONY :
@echo "Making: module definition file" $(@:f)
@echo LIBRARY $(SHL6TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
@echo DATA MULTIPLE >>$@.tmpfile
- @echo DESCRIPTION 'StarView 3.00 $(DEF6DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
@@ -1853,7 +1847,7 @@ $(DEF7TARGETN) .PHONY :
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL7TARGET8=$(shell @fix_shl $(SHL7TARGETN:f))
+SHL7TARGET8=$(shell @fix_shl.cmd $(SHL7TARGETN:f))
DEF7FILTER=$(SOLARENV)/inc/dummy.flt
DEF7NAMELIST=$(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib)
@@ -1869,7 +1863,6 @@ $(DEF7TARGETN) .PHONY :
@echo "Making: module definition file" $(@:f)
@echo LIBRARY $(SHL7TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
@echo DATA MULTIPLE >>$@.tmpfile
- @echo DESCRIPTION 'StarView 3.00 $(DEF7DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
@@ -2134,7 +2127,7 @@ $(DEF8TARGETN) .PHONY :
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL8TARGET8=$(shell @fix_shl $(SHL8TARGETN:f))
+SHL8TARGET8=$(shell @fix_shl.cmd $(SHL8TARGETN:f))
DEF8FILTER=$(SOLARENV)/inc/dummy.flt
DEF8NAMELIST=$(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib)
@@ -2150,7 +2143,6 @@ $(DEF8TARGETN) .PHONY :
@echo "Making: module definition file" $(@:f)
@echo LIBRARY $(SHL8TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
@echo DATA MULTIPLE >>$@.tmpfile
- @echo DESCRIPTION 'StarView 3.00 $(DEF8DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
@@ -2415,7 +2407,7 @@ $(DEF9TARGETN) .PHONY :
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL9TARGET8=$(shell @fix_shl $(SHL9TARGETN:f))
+SHL9TARGET8=$(shell @fix_shl.cmd $(SHL9TARGETN:f))
DEF9FILTER=$(SOLARENV)/inc/dummy.flt
DEF9NAMELIST=$(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib)
@@ -2431,7 +2423,6 @@ $(DEF9TARGETN) .PHONY :
@echo "Making: module definition file" $(@:f)
@echo LIBRARY $(SHL9TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
@echo DATA MULTIPLE >>$@.tmpfile
- @echo DESCRIPTION 'StarView 3.00 $(DEF9DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
@@ -2696,7 +2687,7 @@ $(DEF10TARGETN) .PHONY :
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL10TARGET8=$(shell @fix_shl $(SHL10TARGETN:f))
+SHL10TARGET8=$(shell @fix_shl.cmd $(SHL10TARGETN:f))
DEF10FILTER=$(SOLARENV)/inc/dummy.flt
DEF10NAMELIST=$(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib)
@@ -2712,7 +2703,6 @@ $(DEF10TARGETN) .PHONY :
@echo "Making: module definition file" $(@:f)
@echo LIBRARY $(SHL10TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
@echo DATA MULTIPLE >>$@.tmpfile
- @echo DESCRIPTION 'StarView 3.00 $(DEF10DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
Modified: incubator/ooo/trunk/main/solenv/inc/_tg_lib.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/_tg_lib.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/_tg_lib.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/_tg_lib.mk Sat Feb 18 18:31:52 2012
@@ -25,7 +25,12 @@ $(LIB1ARCHIV) : $(LIB1TARGET)
@cat $(MISC)/$(LIB1ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB1ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
+
+.ELIF "$(GUI)"=="OS2"
+
+ @ln -s $(LIB1TARGET) $(LIB1ARCHIV)
+
+.ELSE # "$(GUI)"=="OS2"
.IF "$(GUI)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB1ARCHIV:b).cmd
@@ -127,7 +132,12 @@ $(LIB2ARCHIV) : $(LIB2TARGET)
@cat $(MISC)/$(LIB2ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB2ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
+
+.ELIF "$(GUI)"=="OS2"
+
+ @ln -s $(LIB2TARGET) $(LIB2ARCHIV)
+
+.ELSE # "$(GUI)"=="OS2"
.IF "$(GUI)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB2ARCHIV:b).cmd
@@ -229,7 +239,12 @@ $(LIB3ARCHIV) : $(LIB3TARGET)
@cat $(MISC)/$(LIB3ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB3ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
+
+.ELIF "$(GUI)"=="OS2"
+
+ @ln -s $(LIB3TARGET) $(LIB3ARCHIV)
+
+.ELSE # "$(GUI)"=="OS2"
.IF "$(GUI)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB3ARCHIV:b).cmd
@@ -331,7 +346,12 @@ $(LIB4ARCHIV) : $(LIB4TARGET)
@cat $(MISC)/$(LIB4ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB4ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
+
+.ELIF "$(GUI)"=="OS2"
+
+ @ln -s $(LIB4TARGET) $(LIB4ARCHIV)
+
+.ELSE # "$(GUI)"=="OS2"
.IF "$(GUI)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB4ARCHIV:b).cmd
@@ -433,7 +453,12 @@ $(LIB5ARCHIV) : $(LIB5TARGET)
@cat $(MISC)/$(LIB5ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB5ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
+
+.ELIF "$(GUI)"=="OS2"
+
+ @ln -s $(LIB5TARGET) $(LIB5ARCHIV)
+
+.ELSE # "$(GUI)"=="OS2"
.IF "$(GUI)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB5ARCHIV:b).cmd
@@ -535,7 +560,12 @@ $(LIB6ARCHIV) : $(LIB6TARGET)
@cat $(MISC)/$(LIB6ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB6ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
+
+.ELIF "$(GUI)"=="OS2"
+
+ @ln -s $(LIB6TARGET) $(LIB6ARCHIV)
+
+.ELSE # "$(GUI)"=="OS2"
.IF "$(GUI)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB6ARCHIV:b).cmd
@@ -637,7 +667,12 @@ $(LIB7ARCHIV) : $(LIB7TARGET)
@cat $(MISC)/$(LIB7ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB7ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
+
+.ELIF "$(GUI)"=="OS2"
+
+ @ln -s $(LIB7TARGET) $(LIB7ARCHIV)
+
+.ELSE # "$(GUI)"=="OS2"
.IF "$(GUI)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB7ARCHIV:b).cmd
@@ -739,7 +774,12 @@ $(LIB8ARCHIV) : $(LIB8TARGET)
@cat $(MISC)/$(LIB8ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB8ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
+
+.ELIF "$(GUI)"=="OS2"
+
+ @ln -s $(LIB8TARGET) $(LIB8ARCHIV)
+
+.ELSE # "$(GUI)"=="OS2"
.IF "$(GUI)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB8ARCHIV:b).cmd
@@ -841,7 +881,12 @@ $(LIB9ARCHIV) : $(LIB9TARGET)
@cat $(MISC)/$(LIB9ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB9ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
+
+.ELIF "$(GUI)"=="OS2"
+
+ @ln -s $(LIB9TARGET) $(LIB9ARCHIV)
+
+.ELSE # "$(GUI)"=="OS2"
.IF "$(GUI)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB9ARCHIV:b).cmd
@@ -943,7 +988,12 @@ $(LIB10ARCHIV) : $(LIB10TARGET)
@cat $(MISC)/$(LIB10ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB10ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
+
+.ELIF "$(GUI)"=="OS2"
+
+ @ln -s $(LIB10TARGET) $(LIB10ARCHIV)
+
+.ELSE # "$(GUI)"=="OS2"
.IF "$(GUI)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB10ARCHIV:b).cmd
Modified: incubator/ooo/trunk/main/solenv/inc/_tg_shl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/_tg_shl.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/_tg_shl.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/_tg_shl.mk Sat Feb 18 18:31:52 2012
@@ -241,7 +241,7 @@ $(MISC)/%linkinc.ls:
.IF "$(GUI)" == "OS2"
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL1TARGET8=$(shell @fix_shl $(SHL1TARGET))
+SHL1TARGET8=$(shell @fix_shl.cmd $(SHL1TARGET))
.ENDIF
.IF "$(GUI)" == "OS2"
@@ -483,7 +483,7 @@ $(SHL1TARGETN) : \
.IF "$(GUI)" == "OS2"
.IF "$(SHL1DEFAULTRES)"!=""
- @+-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc > $(NULLDEV)
.IF "$(SHL1ICON)" != ""
@-+echo 1 ICON $(SHL1ICON) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
.ENDIF
@@ -511,9 +511,9 @@ $(SHL1TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL1OBJS) $(SHL1VERSIONOBJ) \
$(SHL1LIBS) \
- $(SHL1STDLIBS:^"-l") \
$(SHL1LINKRES) \
- $(SHL1STDSHL:^"-l") $(STDSHL1:^"-l")
+ $(SHL1STDLIBS) \
+ $(SHL1STDSHL) $(STDSHL1)
.ELSE # "$(USE_DEFFILE)"!=""
@@ -526,13 +526,15 @@ $(SHL1TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL1OBJS) $(SHL1VERSIONOBJ) \
$(SHL1LIBS) \
- $(SHL1STDLIBS:^"-l") \
$(SHL1LINKRES) \
- $(SHL1STDSHL:^"-l") $(STDSHL1:^"-l") \
- @$(LS) $@ >& $(NULLDEV)
+ $(SHL1STDLIBS) \
+ $(SHL1STDSHL) $(STDSHL1)
.ENDIF # "$(USE_DEFFILE)"!=""
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL1IMPLIBN) $@
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL1TARGET).lib $@
+
.IF "$(SHL1TARGET8)" != "$(SHL1TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL1TARGET8).dll
.ENDIF
@@ -784,7 +786,7 @@ $(MISC)/%linkinc.ls:
.IF "$(GUI)" == "OS2"
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL2TARGET8=$(shell @fix_shl $(SHL2TARGET))
+SHL2TARGET8=$(shell @fix_shl.cmd $(SHL2TARGET))
.ENDIF
.IF "$(GUI)" == "OS2"
@@ -1026,7 +1028,7 @@ $(SHL2TARGETN) : \
.IF "$(GUI)" == "OS2"
.IF "$(SHL2DEFAULTRES)"!=""
- @+-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc > $(NULLDEV)
.IF "$(SHL2ICON)" != ""
@-+echo 1 ICON $(SHL2ICON) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
.ENDIF
@@ -1054,9 +1056,9 @@ $(SHL2TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL2OBJS) $(SHL2VERSIONOBJ) \
$(SHL2LIBS) \
- $(SHL2STDLIBS:^"-l") \
$(SHL2LINKRES) \
- $(SHL2STDSHL:^"-l") $(STDSHL2:^"-l")
+ $(SHL2STDLIBS) \
+ $(SHL2STDSHL) $(STDSHL2)
.ELSE # "$(USE_DEFFILE)"!=""
@@ -1069,13 +1071,15 @@ $(SHL2TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL2OBJS) $(SHL2VERSIONOBJ) \
$(SHL2LIBS) \
- $(SHL2STDLIBS:^"-l") \
$(SHL2LINKRES) \
- $(SHL2STDSHL:^"-l") $(STDSHL2:^"-l") \
- @$(LS) $@ >& $(NULLDEV)
+ $(SHL2STDLIBS) \
+ $(SHL2STDSHL) $(STDSHL2)
.ENDIF # "$(USE_DEFFILE)"!=""
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL2IMPLIBN) $@
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL2TARGET).lib $@
+
.IF "$(SHL2TARGET8)" != "$(SHL2TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL2TARGET8).dll
.ENDIF
@@ -1327,7 +1331,7 @@ $(MISC)/%linkinc.ls:
.IF "$(GUI)" == "OS2"
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL3TARGET8=$(shell @fix_shl $(SHL3TARGET))
+SHL3TARGET8=$(shell @fix_shl.cmd $(SHL3TARGET))
.ENDIF
.IF "$(GUI)" == "OS2"
@@ -1569,7 +1573,7 @@ $(SHL3TARGETN) : \
.IF "$(GUI)" == "OS2"
.IF "$(SHL3DEFAULTRES)"!=""
- @+-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc > $(NULLDEV)
.IF "$(SHL3ICON)" != ""
@-+echo 1 ICON $(SHL3ICON) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
.ENDIF
@@ -1597,9 +1601,9 @@ $(SHL3TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL3OBJS) $(SHL3VERSIONOBJ) \
$(SHL3LIBS) \
- $(SHL3STDLIBS:^"-l") \
$(SHL3LINKRES) \
- $(SHL3STDSHL:^"-l") $(STDSHL3:^"-l")
+ $(SHL3STDLIBS) \
+ $(SHL3STDSHL) $(STDSHL3)
.ELSE # "$(USE_DEFFILE)"!=""
@@ -1612,13 +1616,15 @@ $(SHL3TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL3OBJS) $(SHL3VERSIONOBJ) \
$(SHL3LIBS) \
- $(SHL3STDLIBS:^"-l") \
$(SHL3LINKRES) \
- $(SHL3STDSHL:^"-l") $(STDSHL3:^"-l") \
- @$(LS) $@ >& $(NULLDEV)
+ $(SHL3STDLIBS) \
+ $(SHL3STDSHL) $(STDSHL3)
.ENDIF # "$(USE_DEFFILE)"!=""
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL3IMPLIBN) $@
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL3TARGET).lib $@
+
.IF "$(SHL3TARGET8)" != "$(SHL3TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL3TARGET8).dll
.ENDIF
@@ -1870,7 +1876,7 @@ $(MISC)/%linkinc.ls:
.IF "$(GUI)" == "OS2"
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL4TARGET8=$(shell @fix_shl $(SHL4TARGET))
+SHL4TARGET8=$(shell @fix_shl.cmd $(SHL4TARGET))
.ENDIF
.IF "$(GUI)" == "OS2"
@@ -2112,7 +2118,7 @@ $(SHL4TARGETN) : \
.IF "$(GUI)" == "OS2"
.IF "$(SHL4DEFAULTRES)"!=""
- @+-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc > $(NULLDEV)
.IF "$(SHL4ICON)" != ""
@-+echo 1 ICON $(SHL4ICON) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
.ENDIF
@@ -2140,9 +2146,9 @@ $(SHL4TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL4OBJS) $(SHL4VERSIONOBJ) \
$(SHL4LIBS) \
- $(SHL4STDLIBS:^"-l") \
$(SHL4LINKRES) \
- $(SHL4STDSHL:^"-l") $(STDSHL4:^"-l")
+ $(SHL4STDLIBS) \
+ $(SHL4STDSHL) $(STDSHL4)
.ELSE # "$(USE_DEFFILE)"!=""
@@ -2155,13 +2161,15 @@ $(SHL4TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL4OBJS) $(SHL4VERSIONOBJ) \
$(SHL4LIBS) \
- $(SHL4STDLIBS:^"-l") \
$(SHL4LINKRES) \
- $(SHL4STDSHL:^"-l") $(STDSHL4:^"-l") \
- @$(LS) $@ >& $(NULLDEV)
+ $(SHL4STDLIBS) \
+ $(SHL4STDSHL) $(STDSHL4)
.ENDIF # "$(USE_DEFFILE)"!=""
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL4IMPLIBN) $@
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL4TARGET).lib $@
+
.IF "$(SHL4TARGET8)" != "$(SHL4TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL4TARGET8).dll
.ENDIF
@@ -2413,7 +2421,7 @@ $(MISC)/%linkinc.ls:
.IF "$(GUI)" == "OS2"
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL5TARGET8=$(shell @fix_shl $(SHL5TARGET))
+SHL5TARGET8=$(shell @fix_shl.cmd $(SHL5TARGET))
.ENDIF
.IF "$(GUI)" == "OS2"
@@ -2655,7 +2663,7 @@ $(SHL5TARGETN) : \
.IF "$(GUI)" == "OS2"
.IF "$(SHL5DEFAULTRES)"!=""
- @+-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc > $(NULLDEV)
.IF "$(SHL5ICON)" != ""
@-+echo 1 ICON $(SHL5ICON) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
.ENDIF
@@ -2683,9 +2691,9 @@ $(SHL5TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL5OBJS) $(SHL5VERSIONOBJ) \
$(SHL5LIBS) \
- $(SHL5STDLIBS:^"-l") \
$(SHL5LINKRES) \
- $(SHL5STDSHL:^"-l") $(STDSHL5:^"-l")
+ $(SHL5STDLIBS) \
+ $(SHL5STDSHL) $(STDSHL5)
.ELSE # "$(USE_DEFFILE)"!=""
@@ -2698,13 +2706,15 @@ $(SHL5TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL5OBJS) $(SHL5VERSIONOBJ) \
$(SHL5LIBS) \
- $(SHL5STDLIBS:^"-l") \
$(SHL5LINKRES) \
- $(SHL5STDSHL:^"-l") $(STDSHL5:^"-l") \
- @$(LS) $@ >& $(NULLDEV)
+ $(SHL5STDLIBS) \
+ $(SHL5STDSHL) $(STDSHL5)
.ENDIF # "$(USE_DEFFILE)"!=""
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL5IMPLIBN) $@
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL5TARGET).lib $@
+
.IF "$(SHL5TARGET8)" != "$(SHL5TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL5TARGET8).dll
.ENDIF
@@ -2956,7 +2966,7 @@ $(MISC)/%linkinc.ls:
.IF "$(GUI)" == "OS2"
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL6TARGET8=$(shell @fix_shl $(SHL6TARGET))
+SHL6TARGET8=$(shell @fix_shl.cmd $(SHL6TARGET))
.ENDIF
.IF "$(GUI)" == "OS2"
@@ -3198,7 +3208,7 @@ $(SHL6TARGETN) : \
.IF "$(GUI)" == "OS2"
.IF "$(SHL6DEFAULTRES)"!=""
- @+-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc > $(NULLDEV)
.IF "$(SHL6ICON)" != ""
@-+echo 1 ICON $(SHL6ICON) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
.ENDIF
@@ -3226,9 +3236,9 @@ $(SHL6TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL6OBJS) $(SHL6VERSIONOBJ) \
$(SHL6LIBS) \
- $(SHL6STDLIBS:^"-l") \
$(SHL6LINKRES) \
- $(SHL6STDSHL:^"-l") $(STDSHL6:^"-l")
+ $(SHL6STDLIBS) \
+ $(SHL6STDSHL) $(STDSHL6)
.ELSE # "$(USE_DEFFILE)"!=""
@@ -3241,13 +3251,15 @@ $(SHL6TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL6OBJS) $(SHL6VERSIONOBJ) \
$(SHL6LIBS) \
- $(SHL6STDLIBS:^"-l") \
$(SHL6LINKRES) \
- $(SHL6STDSHL:^"-l") $(STDSHL6:^"-l") \
- @$(LS) $@ >& $(NULLDEV)
+ $(SHL6STDLIBS) \
+ $(SHL6STDSHL) $(STDSHL6)
.ENDIF # "$(USE_DEFFILE)"!=""
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL6IMPLIBN) $@
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL6TARGET).lib $@
+
.IF "$(SHL6TARGET8)" != "$(SHL6TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL6TARGET8).dll
.ENDIF
@@ -3499,7 +3511,7 @@ $(MISC)/%linkinc.ls:
.IF "$(GUI)" == "OS2"
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL7TARGET8=$(shell @fix_shl $(SHL7TARGET))
+SHL7TARGET8=$(shell @fix_shl.cmd $(SHL7TARGET))
.ENDIF
.IF "$(GUI)" == "OS2"
@@ -3741,7 +3753,7 @@ $(SHL7TARGETN) : \
.IF "$(GUI)" == "OS2"
.IF "$(SHL7DEFAULTRES)"!=""
- @+-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc > $(NULLDEV)
.IF "$(SHL7ICON)" != ""
@-+echo 1 ICON $(SHL7ICON) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
.ENDIF
@@ -3769,9 +3781,9 @@ $(SHL7TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL7OBJS) $(SHL7VERSIONOBJ) \
$(SHL7LIBS) \
- $(SHL7STDLIBS:^"-l") \
$(SHL7LINKRES) \
- $(SHL7STDSHL:^"-l") $(STDSHL7:^"-l")
+ $(SHL7STDLIBS) \
+ $(SHL7STDSHL) $(STDSHL7)
.ELSE # "$(USE_DEFFILE)"!=""
@@ -3784,13 +3796,15 @@ $(SHL7TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL7OBJS) $(SHL7VERSIONOBJ) \
$(SHL7LIBS) \
- $(SHL7STDLIBS:^"-l") \
$(SHL7LINKRES) \
- $(SHL7STDSHL:^"-l") $(STDSHL7:^"-l") \
- @$(LS) $@ >& $(NULLDEV)
+ $(SHL7STDLIBS) \
+ $(SHL7STDSHL) $(STDSHL7)
.ENDIF # "$(USE_DEFFILE)"!=""
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL7IMPLIBN) $@
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL7TARGET).lib $@
+
.IF "$(SHL7TARGET8)" != "$(SHL7TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL7TARGET8).dll
.ENDIF
@@ -4042,7 +4056,7 @@ $(MISC)/%linkinc.ls:
.IF "$(GUI)" == "OS2"
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL8TARGET8=$(shell @fix_shl $(SHL8TARGET))
+SHL8TARGET8=$(shell @fix_shl.cmd $(SHL8TARGET))
.ENDIF
.IF "$(GUI)" == "OS2"
@@ -4284,7 +4298,7 @@ $(SHL8TARGETN) : \
.IF "$(GUI)" == "OS2"
.IF "$(SHL8DEFAULTRES)"!=""
- @+-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc > $(NULLDEV)
.IF "$(SHL8ICON)" != ""
@-+echo 1 ICON $(SHL8ICON) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
.ENDIF
@@ -4312,9 +4326,9 @@ $(SHL8TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL8OBJS) $(SHL8VERSIONOBJ) \
$(SHL8LIBS) \
- $(SHL8STDLIBS:^"-l") \
$(SHL8LINKRES) \
- $(SHL8STDSHL:^"-l") $(STDSHL8:^"-l")
+ $(SHL8STDLIBS) \
+ $(SHL8STDSHL) $(STDSHL8)
.ELSE # "$(USE_DEFFILE)"!=""
@@ -4327,13 +4341,15 @@ $(SHL8TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL8OBJS) $(SHL8VERSIONOBJ) \
$(SHL8LIBS) \
- $(SHL8STDLIBS:^"-l") \
$(SHL8LINKRES) \
- $(SHL8STDSHL:^"-l") $(STDSHL8:^"-l") \
- @$(LS) $@ >& $(NULLDEV)
+ $(SHL8STDLIBS) \
+ $(SHL8STDSHL) $(STDSHL8)
.ENDIF # "$(USE_DEFFILE)"!=""
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL8IMPLIBN) $@
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL8TARGET).lib $@
+
.IF "$(SHL8TARGET8)" != "$(SHL8TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL8TARGET8).dll
.ENDIF
@@ -4585,7 +4601,7 @@ $(MISC)/%linkinc.ls:
.IF "$(GUI)" == "OS2"
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL9TARGET8=$(shell @fix_shl $(SHL9TARGET))
+SHL9TARGET8=$(shell @fix_shl.cmd $(SHL9TARGET))
.ENDIF
.IF "$(GUI)" == "OS2"
@@ -4827,7 +4843,7 @@ $(SHL9TARGETN) : \
.IF "$(GUI)" == "OS2"
.IF "$(SHL9DEFAULTRES)"!=""
- @+-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc > $(NULLDEV)
.IF "$(SHL9ICON)" != ""
@-+echo 1 ICON $(SHL9ICON) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
.ENDIF
@@ -4855,9 +4871,9 @@ $(SHL9TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL9OBJS) $(SHL9VERSIONOBJ) \
$(SHL9LIBS) \
- $(SHL9STDLIBS:^"-l") \
$(SHL9LINKRES) \
- $(SHL9STDSHL:^"-l") $(STDSHL9:^"-l")
+ $(SHL9STDLIBS) \
+ $(SHL9STDSHL) $(STDSHL9)
.ELSE # "$(USE_DEFFILE)"!=""
@@ -4870,13 +4886,15 @@ $(SHL9TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL9OBJS) $(SHL9VERSIONOBJ) \
$(SHL9LIBS) \
- $(SHL9STDLIBS:^"-l") \
$(SHL9LINKRES) \
- $(SHL9STDSHL:^"-l") $(STDSHL9:^"-l") \
- @$(LS) $@ >& $(NULLDEV)
+ $(SHL9STDLIBS) \
+ $(SHL9STDSHL) $(STDSHL9)
.ENDIF # "$(USE_DEFFILE)"!=""
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL9IMPLIBN) $@
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL9TARGET).lib $@
+
.IF "$(SHL9TARGET8)" != "$(SHL9TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL9TARGET8).dll
.ENDIF
@@ -5128,7 +5146,7 @@ $(MISC)/%linkinc.ls:
.IF "$(GUI)" == "OS2"
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL10TARGET8=$(shell @fix_shl $(SHL10TARGET))
+SHL10TARGET8=$(shell @fix_shl.cmd $(SHL10TARGET))
.ENDIF
.IF "$(GUI)" == "OS2"
@@ -5370,7 +5388,7 @@ $(SHL10TARGETN) : \
.IF "$(GUI)" == "OS2"
.IF "$(SHL10DEFAULTRES)"!=""
- @+-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc > $(NULLDEV)
.IF "$(SHL10ICON)" != ""
@-+echo 1 ICON $(SHL10ICON) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
.ENDIF
@@ -5398,9 +5416,9 @@ $(SHL10TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL10OBJS) $(SHL10VERSIONOBJ) \
$(SHL10LIBS) \
- $(SHL10STDLIBS:^"-l") \
$(SHL10LINKRES) \
- $(SHL10STDSHL:^"-l") $(STDSHL10:^"-l")
+ $(SHL10STDLIBS) \
+ $(SHL10STDSHL) $(STDSHL10)
.ELSE # "$(USE_DEFFILE)"!=""
@@ -5413,13 +5431,15 @@ $(SHL10TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL10OBJS) $(SHL10VERSIONOBJ) \
$(SHL10LIBS) \
- $(SHL10STDLIBS:^"-l") \
$(SHL10LINKRES) \
- $(SHL10STDSHL:^"-l") $(STDSHL10:^"-l") \
- @$(LS) $@ >& $(NULLDEV)
+ $(SHL10STDLIBS) \
+ $(SHL10STDSHL) $(STDSHL10)
.ENDIF # "$(USE_DEFFILE)"!=""
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL10IMPLIBN) $@
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL10TARGET).lib $@
+
.IF "$(SHL10TARGET8)" != "$(SHL10TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL10TARGET8).dll
.ENDIF
Modified: incubator/ooo/trunk/main/solenv/inc/_tg_zip.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/_tg_zip.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/_tg_zip.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/_tg_zip.mk Sat Feb 18 18:31:52 2012
@@ -81,7 +81,9 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
@echo "Making: " $(@:f)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
+.IF "$(GUI)" != "OS2"
@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
+.ENDIF
.IF "$(common_build_zip)"!=""
.IF "$(ZIP1DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
@@ -204,7 +206,9 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
@echo "Making: " $(@:f)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
+.IF "$(GUI)" != "OS2"
@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
+.ENDIF
.IF "$(common_build_zip)"!=""
.IF "$(ZIP2DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
@@ -327,7 +331,9 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
@echo "Making: " $(@:f)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
+.IF "$(GUI)" != "OS2"
@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
+.ENDIF
.IF "$(common_build_zip)"!=""
.IF "$(ZIP3DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
@@ -450,7 +456,9 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
@echo "Making: " $(@:f)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
+.IF "$(GUI)" != "OS2"
@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
+.ENDIF
.IF "$(common_build_zip)"!=""
.IF "$(ZIP4DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
@@ -573,7 +581,9 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
@echo "Making: " $(@:f)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
+.IF "$(GUI)" != "OS2"
@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
+.ENDIF
.IF "$(common_build_zip)"!=""
.IF "$(ZIP5DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
@@ -696,7 +706,9 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
@echo "Making: " $(@:f)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
+.IF "$(GUI)" != "OS2"
@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
+.ENDIF
.IF "$(common_build_zip)"!=""
.IF "$(ZIP6DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
@@ -819,7 +831,9 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
@echo "Making: " $(@:f)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
+.IF "$(GUI)" != "OS2"
@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
+.ENDIF
.IF "$(common_build_zip)"!=""
.IF "$(ZIP7DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
@@ -942,7 +956,9 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
@echo "Making: " $(@:f)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
+.IF "$(GUI)" != "OS2"
@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
+.ENDIF
.IF "$(common_build_zip)"!=""
.IF "$(ZIP8DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
@@ -1065,7 +1081,9 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
@echo "Making: " $(@:f)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
+.IF "$(GUI)" != "OS2"
@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
+.ENDIF
.IF "$(common_build_zip)"!=""
.IF "$(ZIP9DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
@@ -1188,7 +1206,9 @@ $(ZIP10TARGETN) : delzip $(ZIP10DEPS)
@echo "Making: " $(@:f)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
+.IF "$(GUI)" != "OS2"
@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
+.ENDIF
.IF "$(common_build_zip)"!=""
.IF "$(ZIP10DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
Modified: incubator/ooo/trunk/main/solenv/inc/os2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/os2.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/os2.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/os2.mk Sat Feb 18 18:31:52 2012
@@ -75,7 +75,7 @@ LINKFLAGSDEBUG=/v
LINKFLAGSOPT=/Oc
.ENDIF
-STDOBJVCL=$(L)/salmain.obj
+STDOBJVCL=$(L)/salmain.o
STDOBJGUI=c02.obj
STDSLOGUI=c02d.obj
STDOBJCUI=c02.obj
Modified: incubator/ooo/trunk/main/solenv/inc/os2gcci.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/os2gcci.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/os2gcci.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/os2gcci.mk Sat Feb 18 18:31:52 2012
@@ -175,6 +175,9 @@ CFLAGS+=-DSTL_OS2_BUILDING
CFLAGSCXX+=-DSTL_OS2_BUILDING
.ENDIF
+CFLAGS+=$(LIBXML_CFLAGS) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/os2
+CFLAGSCXX+=$(LIBXML_CFLAGS) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/os2
+
# name of linker
LINK*=gcc
# default linker flags
@@ -189,7 +192,7 @@ LINKFLAGS+=-Zargs-wild -Zargs-resp
#LINKFLAGS+= -Zlinker /NOI -Zlinker /PACKD:65536 -Zlinker /EXEPACK:2
#LINKFLAGS+= -Zlinker /NOExtdictionary
LINKFLAGS+= -Zomf
-#LINKFLAGS+= -Zlinker "DISABLE 1121"
+LINKFLAGS+= -Zlinker "DISABLE 1121"
.ENDIF
@@ -234,10 +237,10 @@ SONAME_SWITCH=-Wl,-h
#STDLIBCPP=stdc++ supc++ gcc_eh
#STDLIBCPP=stdc++ gcc432
-STDLIBCPP=stdc432 gcc432
+STDLIBCPP=-lstdc++ -lgcc_so_d
# default objectfilenames to link
-STDOBJVCL=$(L)/salmain.obj
+STDOBJVCL=$(L)/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
@@ -252,13 +255,13 @@ STDLIBGUIST=$(STDLIBCPP)
STDSHLGUIMT=$(STDLIBCPP)
STDSHLCUIMT=$(STDLIBCPP)
-LIBSTLPORT=$(DYNAMIC) stlp45.lib
-LIBSTLPORTST=$(STATIC) stlp45.lib $(DYNAMIC)
+LIBSTLPORT=stlp45.lib $(DYNAMIC)
+LIBSTLPORTST=stlp45.lib $(STATIC) $(DYNAMIC)
# name of library manager
LIBMGR=ar
-LIBFLAGS=crv
+LIBFLAGS=-crv
.IF "$(aout)"==""
LIBMGR=emxomfar -p2048
Modified: incubator/ooo/trunk/main/solenv/inc/pstrules.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/pstrules.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/pstrules.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/pstrules.mk Sat Feb 18 18:31:52 2012
@@ -135,7 +135,7 @@ $(PAR)/%.par :
.ENDIF
# YD: INCLUDE macro too long, include only few items (scp2 compile)
.IF "$(GUI)"=="OS2"
- $(CPPLCC) -+ -P -I..\..\inc -I..\..\os2gcci.pro\inc $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
+ $(CPPLCC) -+ -P -I../../inc -I../../os2gcci.pro/inc $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
.ENDIF
.IF "$(GUI)"=="UNX"
$(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
Modified: incubator/ooo/trunk/main/solenv/inc/settings.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/settings.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/settings.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/settings.mk Sat Feb 18 18:31:52 2012
@@ -297,6 +297,9 @@ dbgutil=
DMAKE_WORK_DIR*:=$(subst,/,/ $(PWD))
.IF "$(GUI)"=="WNT"
posix_PWD:=/cygdrive/$(PWD:s/://)
+.ELIF "$(GUI)"=="OS2"
+# add /drives/ prefix, requires libc pathrewriter, otherwise breaks dmake % rule
+posix_PWD:=/drives/$(PWD:s/://)
.ELSE #GUI)"=="WNT"
posix_PWD:=$(PWD)
.ENDIF #GUI)"=="WNT"
@@ -1206,8 +1209,12 @@ STDSHL=$(STDSHLCUIMT)
.EXPORT : PICSWITCH
.IF "$(USE_SYSTEM_STL)"=="YES"
+.IF "$(GUI)"=="OS2"
+LIBSTLPORT=
+.ELSE
LIBSTLPORT=""
.ENDIF
+.ENDIF
.IF "$(NO_DEFAULT_STL)"==""
STDLIB+=$(LIBSTLPORT)
@@ -1358,7 +1365,7 @@ CPPUNIT_CFLAGS =
COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/
COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/
-.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT" || "$(OS)" == "OS2"
COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$BRAND_BASE_DIR/program/
.ELSE
COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$OOO_BASE_DIR/program/
Modified: incubator/ooo/trunk/main/solenv/inc/shlinfo.rc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/shlinfo.rc?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/shlinfo.rc (original)
+++ incubator/ooo/trunk/main/solenv/inc/shlinfo.rc Sat Feb 18 18:31:52 2012
@@ -32,6 +32,9 @@
#define OS2_VERSION "hello world"
+// YD write some default code...
+MENU 1 BEGIN END
+
#else
#include <windows.h>
Modified: incubator/ooo/trunk/main/solenv/inc/startup/OS2/macros.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/startup/OS2/macros.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/startup/OS2/macros.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/startup/OS2/macros.mk Sat Feb 18 18:31:52 2012
@@ -20,8 +20,8 @@ S *:= .asm # Assembler sources
V *:= # RCS suffix
.MKSARGS *:= yes
-RM *= $(ROOTDIR)$/bin$/rm
-MV *= $(ROOTDIR)$/bin$/mv
+RM *= rm
+MV *= mv
DIVFILE *= $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
__.DIVSEP-sh-yes !:= \\\
__.DIVSEP-sh-no !:= \\
Modified: incubator/ooo/trunk/main/solenv/inc/target.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/target.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/target.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/target.mk Sat Feb 18 18:31:52 2012
@@ -32,7 +32,9 @@ CDEFS+=-DSTL_OS2_BUILDING
.ENDIF
.IF "$(VISIBILITY_HIDDEN)" != ""
.IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+.IF "$(GUI)" != "OS2"
CFLAGS += -fvisibility=hidden
+.ENDIF
.ELIF "$(COMNAME)" == "sunpro5" && "$(CCNUMVER)" >= "00050005"
CFLAGS += -xldscope=hidden
.ENDIF
Modified: incubator/ooo/trunk/main/solenv/inc/tg_app.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/tg_app.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/tg_app.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/tg_app.mk Sat Feb 18 18:31:52 2012
@@ -244,11 +244,11 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP$(TNR)LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP$(TNR)LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP$(TNR)LINKRES:b).rc > $(NULLDEV)
.IF "$(APP$(TNR)ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP$(TNR)ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP$(TNR)ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
.ENDIF # "$(APP$(TNR)ICON)" != ""
.IF "$(APP$(TNR)VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
@@ -261,22 +261,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(
@echo NAME $(APP$(TNR)TARGET) WINDOWAPI > $(MISC)/$(APP$(TNR)TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP$(TNR)LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \
- $(APP$(TNR)STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP$(TNR)LINKRES) \
- $(APP$(TNR)RES) \
- $(APP$(TNR)DEF) \
- $(APP$(TNR)OBJS) \
- $(APP$(TNR)LIBS) \
- $(APP$(TNR)STDLIBS:^"-l") \
- $(APP$(TNR)STDLIB:^"-l") $(STDLIB$(TNR):^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP$(TNR)LINKER) -v \
$(APP$(TNR)LINKFLAGS) \
$(LINKFLAGSAPP) $(APP$(TNR)BASEX) \
@@ -290,8 +274,8 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(
$(APP$(TNR)DEF) \
$(APP$(TNR)OBJS) \
$(APP$(TNR)LIBS) \
- $(APP$(TNR)STDLIBS:^"-l") \
- $(APP$(TNR)STDLIB:^"-l") $(STDLIB$(TNR):^"-l")
+ $(APP$(TNR)STDLIBS) \
+ $(APP$(TNR)STDLIB) $(STDLIB$(TNR))
.IF "$(APP$(TNR)TARGET)" == "loader"
Modified: incubator/ooo/trunk/main/solenv/inc/tg_def.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/tg_def.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/tg_def.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/tg_def.mk Sat Feb 18 18:31:52 2012
@@ -192,7 +192,7 @@ $(DEF$(TNR)TARGETN) .PHONY :
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL$(TNR)TARGET8=$(shell @fix_shl $(SHL$(TNR)TARGETN:f))
+SHL$(TNR)TARGET8=$(shell @fix_shl.cmd $(SHL$(TNR)TARGETN:f))
DEF$(TNR)FILTER=$(SOLARENV)/inc/dummy.flt
DEF$(TNR)NAMELIST=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib)
@@ -208,7 +208,6 @@ $(DEF$(TNR)TARGETN) .PHONY :
@echo "Making: module definition file" $(@:f)
@echo LIBRARY $(SHL$(TNR)TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
@echo DATA MULTIPLE >>$@.tmpfile
- @echo DESCRIPTION 'StarView 3.00 $(DEF$(TNR)DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
Modified: incubator/ooo/trunk/main/solenv/inc/tg_ext.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/tg_ext.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/tg_ext.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/tg_ext.mk Sat Feb 18 18:31:52 2012
@@ -220,6 +220,12 @@ patch : $(MISC)/$(TARGET)_convert_dos_fl
.ENDIF # "$(CONVERTFILES)"!=""
+.IF "$(OS)"=="OS2"
+# YD do not trigger bash for scripts!
+CONFIG_SHELL=sh.exe
+.EXPORT: CONFIG_SHELL
+.ENDIF
+
$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
@@-$(RM) $@
.IF "$(CONFIGURE_ACTION)" == "none" || "$(CONFIGURE_ACTION)"==""
@@ -345,7 +351,11 @@ create_patch : $(MISC)/$(TARFILE_ROOTDIR
$(COMMAND_ECHO)-$(TOUCH) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
$(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/patch_sanitizer.pl $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME)
@@-$(RM) $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
+.IF "$(GUI)" == "OS2"
+ $(COMMAND_ECHO)dmake $(MAKEMACROS) patch
+.ELSE
$(COMMAND_ECHO)$(MAKECMD) $(MAKEMACROS) patch
+.ENDIF
@echo still some problems with win32 generated patches...
@echo $(USQ)find your new changes in $(NEW_PATCH_FILE_NAME). don't forget to move/rename that patch and insert it in your makefiles PATCH_FILES to activate.$(USQ)
Modified: incubator/ooo/trunk/main/solenv/inc/tg_lib.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/tg_lib.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/tg_lib.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/tg_lib.mk Sat Feb 18 18:31:52 2012
@@ -50,7 +50,12 @@ $(LIB$(TNR)ARCHIV) : $(LIB$(TNR)TARGET)
@cat $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
+
+.ELIF "$(GUI)"=="OS2"
+
+ @ln -s $(LIB$(TNR)TARGET) $(LIB$(TNR)ARCHIV)
+
+.ELSE # "$(GUI)"=="OS2"
.IF "$(GUI)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
Modified: incubator/ooo/trunk/main/solenv/inc/tg_shl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/tg_shl.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/tg_shl.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/tg_shl.mk Sat Feb 18 18:31:52 2012
@@ -266,7 +266,7 @@ $(MISC)/%linkinc.ls:
.IF "$(GUI)" == "OS2"
#21/02/2006 YD dll names must be 8.3, invoke fix script
#check osl/os2/module.c/osl_loadModule()
-SHL$(TNR)TARGET8=$(shell @fix_shl $(SHL$(TNR)TARGET))
+SHL$(TNR)TARGET8=$(shell @fix_shl.cmd $(SHL$(TNR)TARGET))
.ENDIF
.IF "$(GUI)" == "OS2"
@@ -508,7 +508,7 @@ $(SHL$(TNR)TARGETN) : \
.IF "$(GUI)" == "OS2"
.IF "$(SHL$(TNR)DEFAULTRES)"!=""
- @+-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc > $(NULLDEV)
.IF "$(SHL$(TNR)ICON)" != ""
@-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
.ENDIF
@@ -536,9 +536,9 @@ $(SHL$(TNR)TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
$(SHL$(TNR)LIBS) \
- $(SHL$(TNR)STDLIBS:^"-l") \
$(SHL$(TNR)LINKRES) \
- $(SHL$(TNR)STDSHL:^"-l") $(STDSHL$(TNR):^"-l")
+ $(SHL$(TNR)STDLIBS) \
+ $(SHL$(TNR)STDSHL) $(STDSHL$(TNR))
.ELSE # "$(USE_DEFFILE)"!=""
@@ -551,13 +551,15 @@ $(SHL$(TNR)TARGETN) : \
-L$(SOLARVERSION)/$(INPATH)/lib \
$(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
$(SHL$(TNR)LIBS) \
- $(SHL$(TNR)STDLIBS:^"-l") \
$(SHL$(TNR)LINKRES) \
- $(SHL$(TNR)STDSHL:^"-l") $(STDSHL$(TNR):^"-l") \
- @$(LS) $@ >& $(NULLDEV)
+ $(SHL$(TNR)STDLIBS) \
+ $(SHL$(TNR)STDSHL) $(STDSHL$(TNR))
.ENDIF # "$(USE_DEFFILE)"!=""
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL$(TNR)IMPLIBN) $@
+ $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL$(TNR)TARGET).lib $@
+
.IF "$(SHL$(TNR)TARGET8)" != "$(SHL$(TNR)TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL$(TNR)TARGET8).dll
.ENDIF
Modified: incubator/ooo/trunk/main/solenv/inc/tg_yxx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/tg_yxx.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/tg_yxx.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/tg_yxx.mk Sat Feb 18 18:31:52 2012
@@ -30,7 +30,11 @@ $(MISC)/%.cxx : %.y
@@-$(COPY:s/-f//) $@.h $(INCCOM)/$(@:b).hxx
@@-$(COPY:s/-f//) $(@:d)/$(@:b).hxx $(INCCOM)/$(@:b).hxx
# fail on not existing .hxx
+.IF "$(OS)" == "OS2"
+ $(COMMAND_ECHO)$(TYPE) $(INCCOM)/$(@:b).hxx > $(NULLDEV)
+.ELSE
$(COMMAND_ECHO)$(TYPE) $(INCCOM)/$(@:b).hxx >& $(NULLDEV)
+.ENDIF
$(INCCOM)/yy%.cxx : %.y
@echo "Making: " $(@:f)
@@ -40,5 +44,8 @@ $(INCCOM)/yy%.cxx : %.y
@@-$(COPY:s/-f//) $@.h $(INCCOM)/$(@:b).hxx
@@-$(COPY:s/-f//) $(@:d)/$(@:b).hxx $(INCCOM)/$(@:b).hxx
# fail on not existing .hxx
+.IF "$(OS)" == "OS2"
+ $(COMMAND_ECHO)$(TYPE) $(INCCOM)/$(@:b).hxx > $(NULLDEV)
+.ELSE
$(COMMAND_ECHO)$(TYPE) $(INCCOM)/$(@:b).hxx >& $(NULLDEV)
-
+.ENDIF
Modified: incubator/ooo/trunk/main/solenv/inc/tg_zip.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/tg_zip.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/tg_zip.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/tg_zip.mk Sat Feb 18 18:31:52 2012
@@ -105,7 +105,9 @@ $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)
@echo "Making: " $(@:f)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
+.IF "$(GUI)" != "OS2"
@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
+.ENDIF
.IF "$(common_build_zip)"!=""
.IF "$(ZIP$(TNR)DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
Modified: incubator/ooo/trunk/main/solenv/inc/unitools.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/unitools.mk?rev=1290840&r1=1290839&r2=1290840&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/unitools.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/unitools.mk Sat Feb 18 18:31:52 2012
@@ -54,7 +54,11 @@ EES:=
EMQ:=\\
USQ:="
+.IF "$(GUI)" == "OS2"
+NULLDEV:=NUL
+.ELSE
NULLDEV:=/dev/null
+.ENDIF
# iz29609 helpmacro to check if file exists
@@ -145,26 +149,25 @@ SORT*=sort
PERL*=perl
TYPE=cat
CDD=@cd
-COPY*=$(SHELL) /c copy /b
-COPYRECURSE=/s
-COPYUPDATE=/u
+COPY=cp -f
+COPYRECURSE=-r
+COPYUPDATE=-u
DELAY=sleep
ECHON*=echos
-ECHONL=+echo.
+ECHONL=echo
AWK*=awk
GNUCOPY*=cp
GNUPATCH*=gnupatch
GNUMAKE*=make
-TOUCH=touch /c
+TOUCH=touch
#YD rename doesn't work across different drives!
RENAME=mv
-MKDIR=+md
-MKDIRHIER=+md /s
+MKDIR*=mkdir$E
+MKDIRHIER*=mkdir$E -p
GREP=grep
FIND=find
LS=ls
DUMPBIN=echo
-4nt_force_shell:=+
.ENDIF # "$(GUI)"=="UNX"