[ros-diffs] [hpoussin] 30238: On *nix systems, support absolute paths in ROS_INTERMEDIATE and ROS_OUTPUT See issue #2518 for more details.

hpoussin at svn.reactos.org hpoussin at svn.reactos.org
Wed Nov 7 12:29:57 CET 2007


Author: hpoussin
Date: Wed Nov  7 14:29:57 2007
New Revision: 30238

URL: http://svn.reactos.org/svn/reactos?rev=30238&view=rev
Log:
On *nix systems, support absolute paths in ROS_INTERMEDIATE and ROS_OUTPUT
See issue #2518 for more details.

Modified:
    trunk/reactos/Makefile
    trunk/reactos/tools/bin2c.mak
    trunk/reactos/tools/bin2res/bin2res.mak
    trunk/reactos/tools/buildno/buildno.mak
    trunk/reactos/tools/cabman/cabman.mak
    trunk/reactos/tools/cdmake/cdmake.mak
    trunk/reactos/tools/gendib/gendib.mak
    trunk/reactos/tools/mkhive/mkhive.mak
    trunk/reactos/tools/nci/nci.mak
    trunk/reactos/tools/ofw_interface/ofw_interface.mak
    trunk/reactos/tools/pefixup.mak
    trunk/reactos/tools/raddr2line.mak
    trunk/reactos/tools/rbuild/rbuild.mak
    trunk/reactos/tools/rgenstat/rgenstat.mak
    trunk/reactos/tools/rsym.mak
    trunk/reactos/tools/sysreg/sysreg.mak
    trunk/reactos/tools/widl/widl.mak
    trunk/reactos/tools/widl_new/widl.mak
    trunk/reactos/tools/winebuild/winebuild.mak
    trunk/reactos/tools/wmc/wmc.mak
    trunk/reactos/tools/wrc/wrc.mak

Modified: trunk/reactos/Makefile
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/Makefile (original)
+++ trunk/reactos/Makefile Wed Nov  7 14:29:57 2007
@@ -305,7 +305,6 @@
   HOST=mingw32-linux
 endif
 ifeq ($(HOST),mingw32-linux)
-	export EXEPREFIX = ./
 	ifeq ($(OSTYPE),msys)
 		export EXEPOSTFIX = .exe
 	else
@@ -317,7 +316,6 @@
 	cp = $(Q)cp
 	NUL = /dev/null
 else # mingw32-windows
-	export EXEPREFIX =
 	export EXEPOSTFIX = .exe
 	ROS_EMPTY =
 	export SEP = \$(ROS_EMPTY)

Modified: trunk/reactos/tools/bin2c.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/bin2c.mak (original)
+++ trunk/reactos/tools/bin2c.mak Wed Nov  7 14:29:57 2007
@@ -7,7 +7,7 @@
 BIN2C_OUT_ = $(BIN2C_OUT)$(SEP)
 
 BIN2C_TARGET = \
-	$(EXEPREFIX)$(BIN2C_OUT_)bin2c$(EXEPOSTFIX)
+	$(BIN2C_OUT_)bin2c$(EXEPOSTFIX)
 
 BIN2C_SOURCES = \
 	$(BIN2C_BASE_)bin2c.c

Modified: trunk/reactos/tools/bin2res/bin2res.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2res/bin2res.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/bin2res/bin2res.mak (original)
+++ trunk/reactos/tools/bin2res/bin2res.mak Wed Nov  7 14:29:57 2007
@@ -16,7 +16,7 @@
 endif
 
 BIN2RES_TARGET = \
-	$(EXEPREFIX)$(BIN2RES_OUT_)bin2res$(EXEPOSTFIX)
+	$(BIN2RES_OUT_)bin2res$(EXEPOSTFIX)
 
 BIN2RES_DEPENDS = $(BUILDNO_H)
 

Modified: trunk/reactos/tools/buildno/buildno.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/buildno/buildno.mak (original)
+++ trunk/reactos/tools/buildno/buildno.mak Wed Nov  7 14:29:57 2007
@@ -16,7 +16,7 @@
 endif
 
 BUILDNO_TARGET = \
-	$(EXEPREFIX)$(BUILDNO_OUT_)buildno$(EXEPOSTFIX)
+	$(BUILDNO_OUT_)buildno$(EXEPOSTFIX)
 
 BUILDNO_SOURCES = $(addprefix $(BUILDNO_BASE_), \
 	buildno.cpp \

Modified: trunk/reactos/tools/cabman/cabman.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/cabman/cabman.mak (original)
+++ trunk/reactos/tools/cabman/cabman.mak Wed Nov  7 14:29:57 2007
@@ -16,7 +16,7 @@
 endif
 
 CABMAN_TARGET = \
-	$(EXEPREFIX)$(CABMAN_OUT_)cabman$(EXEPOSTFIX)
+	$(CABMAN_OUT_)cabman$(EXEPOSTFIX)
 
 CABMAN_SOURCES = $(addprefix $(CABMAN_BASE_), \
 	cabinet.cxx \

Modified: trunk/reactos/tools/cdmake/cdmake.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/cdmake/cdmake.mak (original)
+++ trunk/reactos/tools/cdmake/cdmake.mak Wed Nov  7 14:29:57 2007
@@ -16,7 +16,7 @@
 endif
 
 CDMAKE_TARGET = \
-	$(EXEPREFIX)$(CDMAKE_OUT_)cdmake$(EXEPOSTFIX)
+	$(CDMAKE_OUT_)cdmake$(EXEPOSTFIX)
 
 CDMAKE_SOURCES = $(addprefix $(CDMAKE_BASE_), \
 	cdmake.c \

Modified: trunk/reactos/tools/gendib/gendib.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/gendib/gendib.mak (original)
+++ trunk/reactos/tools/gendib/gendib.mak Wed Nov  7 14:29:57 2007
@@ -16,7 +16,7 @@
 endif
 
 GENDIB_TARGET = \
-	$(EXEPREFIX)$(GENDIB_OUT_)gendib$(EXEPOSTFIX)
+	$(GENDIB_OUT_)gendib$(EXEPOSTFIX)
 
 GENDIB_SOURCES = \
 	$(GENDIB_BASE_)gendib.c

Modified: trunk/reactos/tools/mkhive/mkhive.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/mkhive/mkhive.mak (original)
+++ trunk/reactos/tools/mkhive/mkhive.mak Wed Nov  7 14:29:57 2007
@@ -16,7 +16,7 @@
 endif
 
 MKHIVE_TARGET = \
-	$(EXEPREFIX)$(MKHIVE_OUT_)mkhive$(EXEPOSTFIX)
+	$(MKHIVE_OUT_)mkhive$(EXEPOSTFIX)
 
 MKHIVE_SOURCES = $(addprefix $(MKHIVE_BASE_), \
 	binhive.c \

Modified: trunk/reactos/tools/nci/nci.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/nci/nci.mak (original)
+++ trunk/reactos/tools/nci/nci.mak Wed Nov  7 14:29:57 2007
@@ -16,7 +16,7 @@
 endif
 
 NCI_TARGET = \
-	$(EXEPREFIX)$(NCI_OUT_)nci$(EXEPOSTFIX)
+	$(NCI_OUT_)nci$(EXEPOSTFIX)
 
 NCI_SOURCES = \
 	$(NCI_BASE_)ncitool.c

Modified: trunk/reactos/tools/ofw_interface/ofw_interface.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ofw_interface/ofw_interface.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/ofw_interface/ofw_interface.mak (original)
+++ trunk/reactos/tools/ofw_interface/ofw_interface.mak Wed Nov  7 14:29:57 2007
@@ -25,7 +25,7 @@
 endif
 
 OFW_INTERFACE_TARGET = \
-	$(EXEPREFIX)$(OFW_INTERFACE_OUT_)ofw_interface$(EXEPOSTFIX)
+	$(OFW_INTERFACE_OUT_)ofw_interface$(EXEPOSTFIX)
 
 OFW_INTERFACE_SOURCES = $(addprefix $(OFW_INTERFACE_BASE_), \
 	ofw_interface.cpp \

Modified: trunk/reactos/tools/pefixup.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/pefixup.mak (original)
+++ trunk/reactos/tools/pefixup.mak Wed Nov  7 14:29:57 2007
@@ -7,7 +7,7 @@
 PEFIXUP_OUT_ = $(PEFIXUP_OUT)$(SEP)
 
 PEFIXUP_TARGET = \
-	$(EXEPREFIX)$(PEFIXUP_OUT_)pefixup$(EXEPOSTFIX)
+	$(PEFIXUP_OUT_)pefixup$(EXEPOSTFIX)
 
 PEFIXUP_SOURCES = \
 	$(PEFIXUP_BASE_)pefixup.c

Modified: trunk/reactos/tools/raddr2line.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/raddr2line.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/raddr2line.mak (original)
+++ trunk/reactos/tools/raddr2line.mak Wed Nov  7 14:29:57 2007
@@ -7,7 +7,7 @@
 RADDR2LINE_OUT_ = $(RADDR2LINE_OUT)$(SEP)
 
 RADDR2LINE_TARGET = \
-	$(EXEPREFIX)$(RADDR2LINE_OUT_)raddr2line$(EXEPOSTFIX)
+	$(RADDR2LINE_OUT_)raddr2line$(EXEPOSTFIX)
 
 RADDR2LINE_SOURCES = \
 	$(RADDR2LINE_BASE_)raddr2line.c \

Modified: trunk/reactos/tools/rbuild/rbuild.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.mak (original)
+++ trunk/reactos/tools/rbuild/rbuild.mak Wed Nov  7 14:29:57 2007
@@ -191,10 +191,10 @@
 
 
 RBUILD_TARGET = \
-	$(EXEPREFIX)$(RBUILD_OUT_)rbuild$(EXEPOSTFIX)
+	$(RBUILD_OUT_)rbuild$(EXEPOSTFIX)
 
 RBUILD_TEST_TARGET = \
-	$(EXEPREFIX)$(RBUILD_OUT_)rbuild_test$(EXEPOSTFIX)
+	$(RBUILD_OUT_)rbuild_test$(EXEPOSTFIX)
 
 RBUILD_BACKEND_MINGW_BASE_SOURCES = $(addprefix $(RBUILD_MINGW_BASE_), \
 	mingw.cpp \

Modified: trunk/reactos/tools/rgenstat/rgenstat.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/rgenstat.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/rgenstat/rgenstat.mak (original)
+++ trunk/reactos/tools/rgenstat/rgenstat.mak Wed Nov  7 14:29:57 2007
@@ -16,7 +16,7 @@
 endif
 
 RGENSTAT_TARGET = \
-	$(EXEPREFIX)$(RGENSTAT_OUT_)rgenstat$(EXEPOSTFIX)
+	$(RGENSTAT_OUT_)rgenstat$(EXEPOSTFIX)
 
 RGENSTAT_SOURCES = $(addprefix $(RGENSTAT_BASE_), \
 	rgenstat.c \

Modified: trunk/reactos/tools/rsym.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/rsym.mak (original)
+++ trunk/reactos/tools/rsym.mak Wed Nov  7 14:29:57 2007
@@ -7,7 +7,7 @@
 RSYM_OUT_ = $(RSYM_OUT)$(SEP)
 
 RSYM_TARGET = \
-	$(EXEPREFIX)$(RSYM_OUT_)rsym$(EXEPOSTFIX)
+	$(RSYM_OUT_)rsym$(EXEPOSTFIX)
 
 RSYM_SOURCES = \
 	$(RSYM_BASE_)rsym.c \

Modified: trunk/reactos/tools/sysreg/sysreg.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/sysreg/sysreg.mak (original)
+++ trunk/reactos/tools/sysreg/sysreg.mak Wed Nov  7 14:29:57 2007
@@ -16,7 +16,7 @@
 endif
 
 SYSREGBUILD_TARGET = \
-	$(EXEPREFIX)$(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX)
+	$(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX)
 
 SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\
 	conf_parser.cpp \

Modified: trunk/reactos/tools/widl/widl.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/widl/widl.mak (original)
+++ trunk/reactos/tools/widl/widl.mak Wed Nov  7 14:29:57 2007
@@ -33,7 +33,7 @@
 endif
 
 WIDL_TARGET = \
-	$(EXEPREFIX)$(WIDL_OUT_)widl$(EXEPOSTFIX)
+	$(WIDL_OUT_)widl$(EXEPOSTFIX)
 
 WIDL_DEPENDS = $(BUILDNO_H)
 

Modified: trunk/reactos/tools/widl_new/widl.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/widl.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/widl_new/widl.mak (original)
+++ trunk/reactos/tools/widl_new/widl.mak Wed Nov  7 14:29:57 2007
@@ -33,7 +33,7 @@
 endif
 
 WIDL_TARGET = \
-	$(EXEPREFIX)$(WIDL_OUT_)widl$(EXEPOSTFIX)
+	$(WIDL_OUT_)widl$(EXEPOSTFIX)
 
 WIDL_DEPENDS = $(BUILDNO_H)
 

Modified: trunk/reactos/tools/winebuild/winebuild.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/winebuild/winebuild.mak (original)
+++ trunk/reactos/tools/winebuild/winebuild.mak Wed Nov  7 14:29:57 2007
@@ -16,7 +16,7 @@
 endif
 
 WINEBUILD_TARGET = \
-	$(EXEPREFIX)$(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX)
+	$(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX)
 
 WINEBUILD_DEPENDS = $(BUILDNO_H)
 

Modified: trunk/reactos/tools/wmc/wmc.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/wmc/wmc.mak (original)
+++ trunk/reactos/tools/wmc/wmc.mak Wed Nov  7 14:29:57 2007
@@ -16,7 +16,7 @@
 endif
 
 WMC_TARGET = \
-	$(EXEPREFIX)$(WMC_OUT_)wmc$(EXEPOSTFIX)
+	$(WMC_OUT_)wmc$(EXEPOSTFIX)
 
 WMC_DEPENDS = $(BUILDNO_H)
 

Modified: trunk/reactos/tools/wrc/wrc.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.mak?rev=30238&r1=30237&r2=30238&view=diff
==============================================================================
--- trunk/reactos/tools/wrc/wrc.mak (original)
+++ trunk/reactos/tools/wrc/wrc.mak Wed Nov  7 14:29:57 2007
@@ -33,7 +33,7 @@
 endif
 
 WRC_TARGET = \
-	$(EXEPREFIX)$(WRC_OUT_)wrc$(EXEPOSTFIX)
+	$(WRC_OUT_)wrc$(EXEPOSTFIX)
 
 WRC_DEPENDS = $(BUILDNO_H)
 




More information about the Ros-diffs mailing list