incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1291394 [12/17] - in /incubator/ooo/branches/alg/install: ./ ext_sources/ extras/l10n/ extras/l10n/source/ extras/l10n/util/ main/ main/accessibility/bridge/org/openoffice/accessibility/ main/accessibility/bridge/org/openoffice/java/access...
Date Mon, 20 Feb 2012 18:06:53 GMT
Modified: incubator/ooo/branches/alg/install/main/solenv/inc/_tg_def.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/_tg_def.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/_tg_def.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/_tg_def.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/_tg_lib.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/_tg_lib.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/_tg_lib.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/_tg_lib.mk Mon Feb 20 18:03:22 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

Propchange: incubator/ooo/branches/alg/install/main/solenv/inc/_tg_rslb.mk
            ('svn:executable' removed)

Modified: incubator/ooo/branches/alg/install/main/solenv/inc/_tg_shl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/_tg_shl.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/_tg_shl.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/_tg_shl.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/_tg_zip.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/_tg_zip.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/_tg_zip.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/_tg_zip.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/libs.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/libs.mk Mon Feb 20 18:03:22 2012
@@ -21,7 +21,7 @@
 
 LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
 
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
 
 #
 #externe libs in plattform.mk
@@ -38,6 +38,11 @@ ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR)
 ICULELIB=-licule$(ICU_MAJOR)$(ICU_MINOR)
 ICUUCLIB=-licuuc$(ICU_MAJOR)$(ICU_MINOR)
 ICUDATALIB=-licudt$(ICU_MAJOR)$(ICU_MINOR)
+.ELIF "$(GUI)"=="OS2"
+ICUINLIB=-licuin
+ICULELIB=-licule
+ICUUCLIB=-licuuc
+ICUDATALIB=-licudt
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 ICUINLIB=-licui18n
 ICULELIB=-licule
@@ -50,6 +55,8 @@ I18NISOLANGLIB=-li18nisolang$(ISOLANG_MA
 I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
 .IF "$(GUI)$(COM)"=="WNTGCC"
 SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
+.ELIF "$(GUI)"=="OS2"
+SALHELPERLIB=-lsalhelp$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 SALHELPERLIB=-luno_salhelper$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -63,12 +70,19 @@ TOOLSLIB=-ltl$(DLLPOSTFIX)
 .IF "$(GUI)$(COM)"=="WNTGCC"
 CPPULIB=-lcppu$(UDK_MAJOR)
 CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
+.ELIF "$(GUI)"=="OS2"
+CPPULIB=-lcppu$(UDK_MAJOR)
+CPPUHELPERLIB=-lcppuh$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 .INCLUDE .IGNORE : ucbhelper/version.mk
+.IF "$(GUI)"=="OS2"
+UCBHELPERLIB=-lucbh$(UCBHELPER_MAJOR)
+.ELSE
 UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
+.ENDIF
 .IF "$(SYSTEM_OPENSSL)" == "YES"
 OPENSSLLIB=$(OPENSSL_LIBS)
 OPENSSLLIBST=$(STATIC) $(OPENSSL_LIBS) $(DYNAMIC)
@@ -80,7 +94,7 @@ OPENSSLLIBST=-lssl_static -lcrypto_stati
 OPENSSLLIBST=$(STATIC) -lssl -lcrypto $(DYNAMIC)
 .ENDIF          # "$(GUI)$(COM)"=="WNTGCC"
 .ENDIF          # "$(SYSTEM_OPENSSL)" == "YES"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
 REGLIB=-lreg$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 REGLIB=-lreg
@@ -89,7 +103,7 @@ REGLIB=-lreg
 VOSLIB=-lvos$(VOS_MAJOR)$(COMID)
 XMLOFFLIB=-lxo$(DLLPOSTFIX)
 XMLOFFLLIB=-lxol
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
 STORELIB=-lstore$(UDK_MAJOR)
 SALLIB=-lsal$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
@@ -100,7 +114,7 @@ SALLIB=-luno_sal
 ODBCLIB=-lodbc$(DLLPOSTFIX)
 ODBCBASELIB=-lodbcbase$(DLLPOSTFIX)
 DBFILELIB=-lfile$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
 RMCXTLIB=-lrmcxt$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 RMCXTLIB=-lrmcxt
@@ -251,7 +265,7 @@ ISCLIB=-lsc$(DLLPOSTFIX)
 ISDLIB=-lsd$(DLLPOSTFIX)
 PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
 HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
 JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 JVMACCESSLIB = -ljvmaccess$(COMID)
@@ -266,7 +280,7 @@ XSLTLIB=$(LIBXSLT_LIBS)
 .ELSE
 XSLTLIB=-lxslt $(LIBXML2LIB)
 .ENDIF
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
 JVMFWKLIB = -ljvmfwk$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 JVMFWKLIB = -ljvmfwk
@@ -330,6 +344,8 @@ HUNSPELLLIB=-lhunspell-1.2
 .ENDIF
 .IF "$(SYSTEM_MYTHES)" == "YES"
 MYTHESLIB=$(MYTHES_LIBS)
+.ELIF "$(GUI)" == "OS2"
+MYTHESLIB=-lmythes
 .ELSE
 MYTHESLIB=-lmythes-1.2
 .ENDIF
@@ -340,7 +356,7 @@ UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest
 XMLREADERLIB=-lxmlreader
 
-.ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+.ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
 
 AWTLIB*=jawt.lib
 AVMEDIALIB=iavmedia.lib
@@ -363,11 +379,7 @@ LDAPBERLIB=ldapber.lib
 CPPULIB=icppu.lib
 CPPUHELPERLIB=icppuhelper.lib
 UCBHELPERLIB=iucbhelper.lib
-.IF "$(GUI)"=="OS2"
-OPENSSLLIB=ssl.lib crypto.lib
-.ELSE
 OPENSSLLIB=ssleay32.lib libeay32.lib
-.ENDIF
 ODBCLIB=iodbc.lib
 ODBCBASELIB=iodbcbase.lib
 DBFILELIB=ifile.lib
@@ -473,13 +485,9 @@ FREETYPELIB=freetype.lib
 PKGCHKLIB=ipkgchk.lib
 HELPLINKERLIB=ihelplinker.lib
 JVMACCESSLIB = ijvmaccess.lib
-CPPUNITLIB = icppunit_dll.lib
 XSLTLIB = libxslt.lib $(LIBXML2LIB)
-.IF "$(GUI)"=="OS2"
-REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib
-.ELSE
+CPPUNITLIB = icppunit_dll.lib
 REDLANDLIB = librdf.lib
-.ENDIF
 
 JVMFWKLIB = ijvmfwk.lib
 
@@ -522,4 +530,4 @@ UNOPKGAPPLIB=iunopkgapp.lib
 TESTLIB=itest.lib
 XMLREADERLIB=ixmlreader.lib
 
-.ENDIF              # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+.ENDIF              # ("$(GUI)"=="UNX" || "$(COM)"=="GCC")

Modified: incubator/ooo/branches/alg/install/main/solenv/inc/os2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/os2.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/os2.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/os2.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/os2gcci.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/os2gcci.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/os2gcci.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/os2gcci.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/pstrules.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/pstrules.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/pstrules.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/pstrules.mk Mon Feb 20 18:03:22 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

Propchange: incubator/ooo/branches/alg/install/main/solenv/inc/set_wntx64.mk
            ('svn:executable' removed)

Modified: incubator/ooo/branches/alg/install/main/solenv/inc/settings.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/settings.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/settings.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/settings.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/shlinfo.rc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/startup/OS2/macros.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/startup/OS2/macros.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/startup/OS2/macros.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/startup/OS2/macros.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/target.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/target.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/target.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/target.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/tg_app.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/tg_app.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/tg_app.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/tg_app.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/tg_def.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/tg_def.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/tg_def.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/tg_def.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/tg_ext.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/tg_ext.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/tg_ext.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/tg_ext.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/tg_lib.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/tg_lib.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/tg_lib.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/tg_lib.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/tg_shl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/tg_shl.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/tg_shl.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/tg_shl.mk Mon Feb 20 18:03:22 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

Propchange: incubator/ooo/branches/alg/install/main/solenv/inc/tg_xmerge.mk
            ('svn:executable' removed)

Modified: incubator/ooo/branches/alg/install/main/solenv/inc/tg_yxx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/tg_yxx.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/tg_yxx.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/tg_yxx.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/tg_zip.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/tg_zip.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/tg_zip.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/tg_zip.mk Mon Feb 20 18:03:22 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/branches/alg/install/main/solenv/inc/unitools.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/unitools.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/unitools.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/unitools.mk Mon Feb 20 18:03:22 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"
 

Propchange: incubator/ooo/branches/alg/install/main/solenv/inc/version.hrc
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/solenv/inc/version_so.hrc
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/solenv/inc/wntgcci.mk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/solenv/inc/wntmsci11.mk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/solenv/src/component.map
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/solenv/src/unloadablecomponent.map
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/soltools/adjustvisibility/makefile.mk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/soltools/mkdepend/collectdircontent.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/soltools/mkdepend/makefile.mk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/soltools/util/makefile.pmk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sot/prj/build.lst
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/splitbuild/filter.lst
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/inc/dialog.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/inc/document.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/inc/format.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/inc/parse.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/inc/starmath.hrc
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/config.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/dialog.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/dialog.hrc
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/document.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/makefile.mk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/mathmlexport.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/mathmlimport.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/mathmlimport.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/node.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/parse.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/smmod.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/smres.src
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/unomodel.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/starmath/source/view.cxx
            ('svn:executable' removed)

Modified: incubator/ooo/branches/alg/install/main/store/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/store/prj/d.lst?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/store/prj/d.lst (original)
+++ incubator/ooo/branches/alg/install/main/store/prj/d.lst Mon Feb 20 18:03:22 2012
@@ -5,6 +5,7 @@ mkdir: %_DEST%\inc%_EXT%\store
 ..\util\store.xml %_DEST%\xml%_EXT%\store.xml
 
 ..\%__SRC%\lib\istore.lib %_DEST%\lib%_EXT%\istore.lib
+..\%__SRC%\lib\store*.lib %_DEST%\lib%_EXT%\store*.lib
 ..\%__SRC%\lib\libstore.*.* %_DEST%\lib%_EXT%\*
 ..\%__SRC%\bin\sto*.dll %_DEST%\bin%_EXT%\sto*.dll
 

Propchange: incubator/ooo/branches/alg/install/main/svgio/inc/svgio/svgreader/svgclippathnode.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svgio/inc/svgio/svgreader/svgmarkernode.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svgio/inc/svgio/svgreader/svgmasknode.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svgio/inc/svgio/svgreader/svgpatternnode.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svgio/prj/d.lst
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svgio/source/svgreader/svgclippathnode.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svgio/source/svgreader/svgmarkernode.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svgio/source/svgreader/svgmasknode.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svgio/source/svgreader/svgpatternnode.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svl/JunitTest_svl_complex.mk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svl/qa/export.map
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svl/source/items/rngitem_inc.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/JunitTest_svtools_unoapi.mk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/inc/svtools/accessiblefactory.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/inc/svtools/toolpanel/decklayouter.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/inc/svtools/toolpanel/tablayouter.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/asynclink.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/calendar.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/calendar.src
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/collatorres.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/ctrlbox.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/ctrlbox.src
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/ctrltool.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/ctrltool.src
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/filectrl.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/filectrl.src
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/filectrl2.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/fileurlbox.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/fixedhyper.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/fmtfield.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/headbar.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/hyperlabel.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/indexentryres.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/inettbc.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/prgsbar.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/roadmap.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/ruler.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/scriptedtext.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/scrwin.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/stdctrl.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/stdmenu.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/svxbox.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/tabbar.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/taskbar.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/taskbox.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/taskmisc.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/taskstat.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/urlcontrol.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/control/valueimp.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/misc/langtab.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/misc/svtaccessiblefactory.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/toolpanel/paneldecklisteners.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/toolpanel/paneldecklisteners.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/toolpanel/paneltabbar.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/toolpanel/tablayouter.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/toolpanel/toolpaneldeck.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/toolpanel/toolpaneldeckpeer.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/toolpanel/toolpaneldeckpeer.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/source/uno/svtxgridcontrol.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svtools/workben/toolpanel/toolpaneltest.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/AllLangResTarget_gal.mk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/JunitTest_svx_unoapi.mk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/inc/svx/AccessibleShape.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/inc/svx/ShapeTypeHandler.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/inc/svx/dbcharsethelper.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/inc/svx/dbtoolsclient.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/inc/svx/dialogs.hrc
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/inc/svx/shapeproperty.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/inc/svx/unoshprp.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/inc/svx/xoutbmp.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/prj/makefile.mk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/source/accessibility/AccessibleShape.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/source/accessibility/ShapeTypeHandler.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/source/dialog/ucsubset.src
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/source/mnuctrls/fntctl.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/source/svdraw/svdibrow.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/source/svdraw/svdmodel.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/svx/source/xoutdev/_xoutbmp.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/JunitTest_sw_complex.mk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/JunitTest_sw_unoapi.mk
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/inc/IDocumentDeviceAccess.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/inc/dochdl.hrc
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/inc/fesh.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/inc/fmtmeta.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/inc/pch/precompiled_sw.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/inc/section.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/inc/switerator.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/qa/complex/checkColor/CheckChangeColor.java
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/qa/complex/indeterminateState/CheckIndeterminateState.java
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/qa/complex/writer/CheckIndexedPropertyValues.java
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/qa/complex/writer/CheckNamedPropertyValues.java
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/qa/complex/writer/TextPortionEnumerationTest.java
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/qa/complex/writer/testdocuments/TESTMETA.odt
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/sdi/_annotsh.sdi
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/sdi/annotsh.sdi
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/crsr/swcrsr.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/doc/docnew.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/doc/docnum.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/doc/tblafmt.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/docnode/ndnotxt.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/docnode/ndsect.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/docnode/section.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/edit/acorrect.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/fields/textapi.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/frmedt/feshview.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/graphic/ndgrf.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/inc/acorrect.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/inc/textapi.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/inc/unometa.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/inc/viewimp.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/layout/fly.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/layout/frmtool.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/layout/paintfrm.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/layout/sectfrm.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/text/frmform.cxx
            ('svn:executable' removed)

Modified: incubator/ooo/branches/alg/install/main/sw/source/core/text/guess.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sw/source/core/text/guess.cxx?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sw/source/core/text/guess.cxx (original)
+++ incubator/ooo/branches/alg/install/main/sw/source/core/text/guess.cxx Mon Feb 20 18:03:22 2012
@@ -230,7 +230,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtP
                      CH_FULL_BLANK == cCutChar ) )
                 --nBreakPos;
         }
-        else
+        else //#i20878#
         {
             while( nX && nBreakPos > rInf.GetLineStart() + 1 &&            
                    ( CH_BLANK == ( cCutChar = rInf.GetChar( --nX ) ) ||

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/text/widorp.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/txtnode/txtedt.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/unocore/unoframe.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/core/view/vdraw.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/filter/ww8/rtfattributeoutput.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/filter/ww8/rtfexport.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/filter/ww8/rtfexport.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/filter/ww8/wrtw8nds.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/filter/ww8/ww8atr.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/app/docsh2.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/dochdl/dochdl.src
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/dochdl/gloshdl.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/dochdl/swdtflvr.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/docvw/romenu.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/inc/annotsh.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/inc/langhelper.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/inc/view.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/inc/wrtsh.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/index/cnttab.src
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/lingu/hhcwrp.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/ribbar/inputwin.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/shells/annotsh.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/shells/langhelper.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/shells/textsh.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/uiview/view.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/uiview/viewling.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/uno/unotxdoc.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/uno/unotxvw.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/vba/vbaeventshelper.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/vba/vbaeventshelper.hxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/source/ui/wrtsh/wrtsh1.cxx
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/uiconfig/sglobal/menubar/menubar.xml
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/uiconfig/sweb/menubar/menubar.xml
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/uiconfig/swform/menubar/menubar.xml
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/uiconfig/swreport/menubar/menubar.xml
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/uiconfig/swriter/menubar/menubar.xml
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sw/uiconfig/swxform/menubar/menubar.xml
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/swext/mediawiki/help/component.txt
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/swext/mediawiki/src/filter/odt2mediawiki.xsl
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/extension.icns
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/apps/base.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/apps/draw.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/apps/impress.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/apps/main.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/apps/math.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/apps/writer.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/16x16/mimetypes/extension.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/32x32/mimetypes/extension.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/hicolor/48x48/mimetypes/extension.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/locolor/16x16/mimetypes/extension.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/locolor/32x32/mimetypes/extension.png
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/ooo11-base-doc.ico
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/ooo11-calc-doc.ico
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/ooo11-calc-tem.ico
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/ooo11-chart-doc.ico
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/ooo11-draw-doc.ico
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/ooo11-draw-tem.ico
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/ooo11-impress-doc.ico
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/ooo11-impress-tem.ico
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/ooo11-master-doc.ico
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/ooo11-math-doc.ico
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/ooo11-writer-doc.ico
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/sysui/desktop/icons/ooo11-writer-tem.ico
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/ch2_lvl1.bas
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/ch2_lvl1_wizard.bas
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/ch2_xml_format.bas
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/includes/ch2_lvl1a.inc
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/input/BubbleChartData.ods
            ('svn:executable' removed)

Propchange: incubator/ooo/branches/alg/install/main/testautomation/chart2/optional/input/ods/2d_areas_normal.ods
            ('svn:executable' removed)



Mime
View raw message