* Build bin2res and cabman in bootstrap makefiles * Remove make directory hack as it wasn't needed anyway Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Added: branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak Modified: branches/xmlbuildsystem/reactos/lib/zlib/zlib.xml Deleted: branches/xmlbuildsystem/reactos/tools/bin2res/Makefile Added: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak Deleted: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.xml Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak Added: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak Deleted: branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml Deleted: branches/xmlbuildsystem/reactos/tools/cabman/makefile Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rmkdir.c Modified: branches/xmlbuildsystem/reactos/tools/tools.mak Deleted: branches/xmlbuildsystem/reactos/tools/tools.xml Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak Modified: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak Modified: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak _____
Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-14 18:51:29 UTC (rev 14066) @@ -133,11 +133,9 @@
endif
mkdir = $(Q)$(INTERMEDIATE)rmkdir -CREATED = .created
-directories: - -${nmkdir} $(INTERMEDIATE_NO_SLASH) - -${nmkdir} $(OUTPUT_NO_SLASH) +$(INTERMEDIATE_NO_SLASH): + ${nmkdir} $(INTERMEDIATE_NO_SLASH)
NTOSKRNL_MC = .$(SEP)ntoskrnl$(SEP)ntoskrnl.mc KERNEL32_MC = .$(SEP)lib$(SEP)kernel32$(SEP)kernel32.mc @@ -158,7 +156,7 @@ $(ERRCODES_RC) \ $(NCI_SERVICE_FILES)
-makefile.auto: $(RMKDIR_TARGET) $(WINEBUILD_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) +makefile.auto: $(RMKDIR_TARGET) $(BIN2RES_TARGET) $(WINEBUILD_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) $(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw
_____
Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-03-14 18:51:29 UTC (rev 14066) @@ -35,9 +35,6 @@
<directory name="drivers"> <xi:include href="drivers/directory.xml" /> </directory> - <directory name="tools"> - <xi:include href="tools/tools.xml" /> - </directory> <directory name="hal"> <xi:include href="hal/directory.xml" /> </directory> _____
Copied: branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak (from rev 14030, branches/xmlbuildsystem/reactos/lib/zlib/Makefile.host) --- branches/xmlbuildsystem/reactos/lib/zlib/Makefile.host 2005-03-13 21:02:04 UTC (rev 14030) +++ branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -0,0 +1,46 @@
+ZLIB_BASE = lib$(SEP)zlib + +ZLIB_BASE_DIR = $(INTERMEDIATE)$(ZLIB_BASE) + +#$(ZLIB_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) +# ${mkdir} $(INTERMEDIATE)$(ZLIB_BASE) + +ZLIB_HOST_TARGET = \ + $(INTERMEDIATE)$(ZLIB_BASE)$(SEP)zlib.host.a + +ZLIB_HOST_SOURCES = \ + $(ZLIB_BASE)$(SEP)cdmake.c \ + $(ZLIB_BASE)$(SEP)llmosrt.c \ + $(ZLIB_BASE)$(SEP)adler32.c \ + $(ZLIB_BASE)$(SEP)compress.c \ + $(ZLIB_BASE)$(SEP)crc32.c \ + $(ZLIB_BASE)$(SEP)gzio.c \ + $(ZLIB_BASE)$(SEP)uncompr.c \ + $(ZLIB_BASE)$(SEP)deflate.c \ + $(ZLIB_BASE)$(SEP)trees.c \ + $(ZLIB_BASE)$(SEP)zutil.c \ + $(ZLIB_BASE)$(SEP)inflate.c \ + $(ZLIB_BASE)$(SEP)infblock.c \ + $(ZLIB_BASE)$(SEP)inftrees.c \ + $(ZLIB_BASE)$(SEP)infcodes.c \ + $(ZLIB_BASE)$(SEP)infutil.c \ + $(ZLIB_BASE)$(SEP)inffast.c + +ZLIB_HOST_OBJECTS = \ + $(ZLIB_HOST_SOURCES:.c=.o) + +ZLIB_HOST_CFLAGS = -MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ + -Wstrict-prototypes -Wmissing-prototypes + +$(ZLIB_HOST_TARGET): $(ZLIB_HOST_BASE_DIR) $(ZLIB_HOST_OBJECTS) + $(ECHO_AR) + $(host_ar) -r $(ZLIB_HOST_TARGET) $(ZLIB_HOST_OBJECTS) + +$(ZLIB_HOST_OBJECTS): %.o : %.c $(ZLIB_BASE_DIR) + $(ECHO_CC) + ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ + +.PHONY: zlib_host_clean +zlib_host_clean: + -@$(rm) $(ZLIB_HOST_TARGET) $(ZLIB_HOST_OBJECTS) 2>$(NUL) +clean: zlib_clean _____
Modified: branches/xmlbuildsystem/reactos/lib/zlib/zlib.xml --- branches/xmlbuildsystem/reactos/lib/zlib/zlib.xml 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/lib/zlib/zlib.xml 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,7 +1,3 @@
<module name="zlib" type="staticlibrary"> <xi:include href="zlib_common.xml" /> </module> - -<module name="hostzlib" type="staticlibrary" host="true" prefix="host_"> - <xi:include href="zlib_common.xml" /> -</module> _____
Deleted: branches/xmlbuildsystem/reactos/tools/bin2res/Makefile --- branches/xmlbuildsystem/reactos/tools/bin2res/Makefile 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/bin2res/Makefile 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,33 +0,0 @@
-PATH_TO_TOP = ../.. - -TARGET = bin2res$(EXE_POSTFIX) - -all: $(TARGET) - -OBJECTS = bin2res.o mkstemps.o - -CLEAN_FILES = *.o bin2res$(EXE_POSTFIX) - -HOST_CFLAGS = -I$(PATH_TO_TOP)/include/wine -D__REACTOS__ -Wall -Werror - -bin2res.o: bin2res.c - $(HOST_CC) -g $(HOST_CFLAGS) -c bin2res.c -o bin2res.o - -mkstemps.o: mkstemps.c - $(HOST_CC) -g $(HOST_CFLAGS) -c mkstemps.c -o mkstemps.o - -bin2res$(EXE_POSTFIX): $(OBJECTS) - $(HOST_CC) -g $(OBJECTS) -o $(TARGET) - -ifeq ($(HOST),mingw32-linux) -clean: - rm -f *.o $(TARGET) -endif -ifneq ($(HOST),mingw32-linux) -clean: - del *.o $(TARGET) -endif - -.PHONY: clean - -include $(PATH_TO_TOP)/rules.mak _____
Copied: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak (from rev 14030, branches/xmlbuildsystem/reactos/tools/bin2res/Makefile) --- branches/xmlbuildsystem/reactos/tools/bin2res/Makefile 2005-03-13 21:02:04 UTC (rev 14030) +++ branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -0,0 +1,33 @@
+BIN2RES_BASE = tools$(SEP)bin2res + +BIN2RES_BASE_DIR = $(INTERMEDIATE)$(BIN2RES_BASE) + +$(BIN2RES_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(BIN2RES_BASE) + +BIN2RES_TARGET = \ + $(INTERMEDIATE)$(BIN2RES_BASE)$(SEP)bin2res$(EXEPOSTFIX) + +BIN2RES_SOURCES = \ + $(BIN2RES_BASE)$(SEP)bin2res.c \ + $(BIN2RES_BASE)$(SEP)mkstemps.c + +BIN2RES_OBJECTS = \ + $(BIN2RES_SOURCES:.c=.o) + +BIN2RES_HOST_CFLAGS = -Iinclude/wine -D__REACTOS__ -g -Werror -Wall + +BIN2RES_HOST_LFLAGS = -g + +$(BIN2RES_TARGET): $(BIN2RES_BASE_DIR) $(BIN2RES_OBJECTS) + $(ECHO_LD) + ${host_gcc} $(BIN2RES_OBJECTS) $(BIN2RES_HOST_LFLAGS) -o $(BIN2RES_TARGET) + +$(BIN2RES_OBJECTS): %.o : %.c $(BIN2RES_BASE_DIR) + $(ECHO_CC) + ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ + +.PHONY: bin2res_clean +bin2res_clean: + -@$(rm) $(BIN2RES_TARGET) $(BIN2RES_OBJECTS) 2>$(NUL) +clean: bin2res_clean _____
Deleted: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.xml --- branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.xml 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.xml 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,6 +0,0 @@
-<module name="bin2res" type="buildtool"> - <include base="ReactOS">include/wine</include> - <define name="__REACTOS__" /> - <file>bin2res.c</file> - <file>mkstemps.c</file> -</module> _____
Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak --- branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,6 +1,6 @@
BUILDNO_BASE = tools$(SEP)buildno
-BUILDNO_BASE_DIR = $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)$(CREATED) +BUILDNO_BASE_DIR = $(INTERMEDIATE)$(BUILDNO_BASE)
$(BUILDNO_BASE_DIR): $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(BUILDNO_BASE) @@ -23,7 +23,7 @@
$(BUILDNO_TARGET): $(BUILDNO_BASE_DIR) $(BUILDNO_OBJECTS) $(ECHO_LD) - ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_CFLAGS) -o $(BUILDNO_TARGET) + ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_LFLAGS) -o $(BUILDNO_TARGET)
$(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$(SEP)buildno.cpp $(ECHO_CC) _____
Copied: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak (from rev 14030, branches/xmlbuildsystem/reactos/tools/cabman/makefile) --- branches/xmlbuildsystem/reactos/tools/cabman/makefile 2005-03-13 21:02:04 UTC (rev 14030) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -0,0 +1,51 @@
+CABMAN_BASE = tools$(SEP)cabman + +CABMAN_BASE_DIR = $(INTERMEDIATE)$(CABMAN_BASE) + +$(CABMAN_BASE_DIR): $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(CABMAN_BASE) + +CABMAN_TARGET = \ + $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)cabman$(EXEPOSTFIX) + +CABMAN_SOURCES = \ + $(CABMAN_BASE)$(SEP)cabinet.cxx \ + $(CABMAN_BASE)$(SEP)dfp.cxx \ + $(CABMAN_BASE)$(SEP)main.cxx \ + $(CABMAN_BASE)$(SEP)mszip.cxx \ + $(CABMAN_BASE)$(SEP)raw.cxx + +CABMAN_OBJECTS = \ + $(addprefix $(INTERMEDIATE), $(CABMAN_SOURCES:.cxx=.o)) + +CABMAN_HOST_CFLAGS = -Iinclude/reactos -g -Werror -Wall + +CABMAN_HOST_LFLAGS = -g $(ZLIB_HOST_TARGET) + +$(CABMAN_TARGET): $(CABMAN_BASE_DIR) $(CABMAN_OBJECTS) + $(ECHO_LD) + ${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $(CABMAN_TARGET) + +$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)cabinet.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)cabinet.cxx + $(ECHO_CC) + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)cabinet.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)cabinet.o + +$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)dfp.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)dfp.cxx + $(ECHO_CC) + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)dfp.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)dfp.o + +$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)main.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)main.cxx + $(ECHO_CC) + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)main.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)main.o + +$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)mszip.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)mszip.cxx + $(ECHO_CC) + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)mszip.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)mszip.o + +$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)raw.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)raw.cxx + $(ECHO_CC) + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)raw.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)raw.o + +.PHONY: cabman_clean +cabman_clean: + -@$(rm) $(CABMAN_TARGET) $(CABMAN_OBJECTS) 2>$(NUL) _____
Deleted: branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml --- branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,10 +0,0 @@
-<module name="cabman" type="buildtool"> - <include base="cabman">.</include> - <include base="hostzlib">.</include> - <library>hostzlib</library> - <file>cabinet.cxx</file> - <file>dfp.cxx</file> - <file>main.cxx</file> - <file>mszip.cxx</file> - <file>raw.cxx</file> -</module> \ No newline at end of file _____
Deleted: branches/xmlbuildsystem/reactos/tools/cabman/makefile --- branches/xmlbuildsystem/reactos/tools/cabman/makefile 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/cabman/makefile 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,3 +0,0 @@
-TOP = ../.. -DEFAULT = cabman -include $(TOP)/proxy.mak \ No newline at end of file _____
Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak --- branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,8 +1,8 @@
CDMAKE_BASE = tools$(SEP)cdmake
-CDMAKE_BASE_DIR = $(INTERMEDIATE)$(CDMAKE_BASE)$(SEP)$(CREATED) +CDMAKE_BASE_DIR = $(INTERMEDIATE)$(CDMAKE_BASE)
-$(CDMAKE_BASE_DIR): $(RMKDIR_TARGET) +$(CDMAKE_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(CDMAKE_BASE)
CDMAKE_TARGET = \ @@ -21,11 +21,11 @@
$(CDMAKE_TARGET): $(CDMAKE_BASE_DIR) $(CDMAKE_OBJECTS) $(ECHO_LD) - ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_CFLAGS) -o $(CDMAKE_TARGET) + ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_LFLAGS) -o $(CDMAKE_TARGET)
$(CDMAKE_OBJECTS): %.o : %.c $(CDMAKE_BASE_DIR) $(ECHO_CC) - ${host_gcc} $(CDMAKE_CFLAGS) -c $< -o $@ + ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@
.PHONY: cdmake_clean cdmake_clean: _____
Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak --- branches/xmlbuildsystem/reactos/tools/nci/nci.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/nci/nci.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,8 +1,8 @@
NCI_BASE = tools$(SEP)nci
-CDMAKE_BASE_DIR = $(INTERMEDIATE)$(NCI_BASE)$(SEP)$(CREATED) +CDMAKE_BASE_DIR = $(INTERMEDIATE)$(NCI_BASE)
-$(CDMAKE_BASE_DIR): $(RMKDIR_TARGET) +$(CDMAKE_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(NCI_BASE)
NCI_TARGET = \ _____
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-14 18:51:29 UTC (rev 14066) @@ -32,13 +32,7 @@
directories.insert ( directory ); }
-const string -MingwBackend::GetDirectoryDependency ( const string& directory ) -{ - return directory + SSEP "$(CREATED)"; -}
- void MingwBackend::Process () { @@ -343,7 +337,7 @@ { fprintf ( fMakefile, "%s:\n", - GetDirectoryDependency ( *i ).c_str () ); + i->c_str () ); fprintf ( fMakefile, "\t${mkdir} %s\n\n", i->c_str () ); _____
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-03-14 18:51:29 UTC (rev 14066) @@ -11,7 +11,6 @@
virtual ~MingwBackend () { }; virtual void Process (); void CreateDirectoryTargetIfNotYetCreated ( const std::string& directory ); - const std::string GetDirectoryDependency ( const std::string& directory ); private: void ProcessModule ( Module& module ); void CreateMakefile (); _____
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-14 18:51:29 UTC (rev 14066) @@ -90,12 +90,6 @@
return file; }
-const string -MingwModuleHandler::GetDirectoryDependency ( const string& file ) -{ - return backend->GetDirectoryDependency ( GetDirectory ( file ) ); -} - void MingwModuleHandler::SetMakefile ( FILE* f ) { @@ -733,7 +727,7 @@ fprintf ( fMakefile, "%s: %s %s\n", objectFilename.c_str (), - GetDirectoryDependency ( objectFilename ).c_str (), + objectFilename.c_str (), deps.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CC)\n" ); fprintf ( fMakefile, @@ -755,7 +749,7 @@ fprintf ( fMakefile, "%s: %s %s\n", objectFilename.c_str (), - GetDirectoryDependency ( objectFilename ).c_str (), + objectFilename.c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, "\t$(ECHO_GAS)\n" ); fprintf ( fMakefile, @@ -776,7 +770,7 @@ fprintf ( fMakefile, "%s: %s %s\n", objectFilename.c_str (), - GetDirectoryDependency ( objectFilename ).c_str (), + objectFilename.c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, "\t$(ECHO_NASM)\n" ); fprintf ( fMakefile, @@ -801,7 +795,7 @@ fprintf ( fMakefile, "%s: %s %s $(WRC_TARGET)\n", objectFilename.c_str (), - GetDirectoryDependency ( objectFilename ).c_str (), + objectFilename.c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); fprintf ( fMakefile, @@ -1375,7 +1369,7 @@ string definitionDependencies = GetDefinitionDependencies ( module ); fprintf ( fMakefile, "%s: %s %s\n", library_target.c_str (), - GetDirectoryDependency ( library_target ).c_str (), + library_target.c_str (), definitionDependencies.c_str () );
fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" ); @@ -2191,7 +2185,7 @@ string targetDirecctory = bootcdDirectory + SSEP + m.bootstrap->base; if ( directories.size () > 0 ) directories += " "; - directories += GetDirectoryDependency ( PassThruCacheDirectory ( FixupTargetFilename ( targetDirecctory ) ) ); + directories += PassThruCacheDirectory ( FixupTargetFilename ( targetDirecctory ) ); } } return directories; @@ -2208,7 +2202,7 @@ string targetDirecctory = bootcdDirectory + SSEP + cdfile.base; if ( directories.size () > 0 ) directories += " "; - directories += GetDirectoryDependency ( PassThruCacheDirectory ( FixupTargetFilename ( targetDirecctory ) ) ); + directories += PassThruCacheDirectory ( FixupTargetFilename ( targetDirecctory ) ); } return directories; } @@ -2280,7 +2274,7 @@ "%s: all %s %s %s %s ${CABMAN_TARGET} ${CDMAKE_TARGET}\n", module.name.c_str (), isoboot.c_str (), - GetDirectoryDependency ( PassThruCacheDirectory ( bootcdReactos ) ).c_str (), + PassThruCacheDirectory ( bootcdReactos ).c_str (), cdDirectories.c_str (), cdFiles.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); _____
Modified: branches/xmlbuildsystem/reactos/tools/rmkdir.c --- branches/xmlbuildsystem/reactos/tools/rmkdir.c 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/rmkdir.c 2005-03-14 18:51:29 UTC (rev 14066) @@ -2,7 +2,6 @@
#include <string.h> #include <stdlib.h> #include <ctype.h> -#include <fcntl.h> #ifdef _MSC_VER #include <direct.h> #else @@ -10,12 +9,6 @@ #include <sys/stat.h> #include <sys/types.h> #endif -#ifdef WIN32 -#include <sys/utime.h> -#include <time.h> -#else -#include <sys/time.h> -#endif
#if defined(WIN32) #define DIR_SEPARATOR_CHAR '\' @@ -31,7 +24,6 @@ { char* newpath; int i; - int length;
//newpath = strdup(origpath); newpath=malloc(strlen(origpath)+1); @@ -55,13 +47,6 @@ #endif i++; } - - length = strlen(newpath); - if (length > 0) - { - if (newpath[length - 1] == DIR_SEPARATOR_CHAR) - newpath[length - 1] = 0; - } return(newpath); }
@@ -95,43 +80,6 @@ return(0); }
-int -write_created_file() -{ - char filename[256]; - int id; -#ifdef WIN32 - time_t now; - struct utimbuf fnow; -#endif - - strcpy(filename, ".created"); - - id = open(filename, S_IWRITE, S_IRUSR | S_IWUSR); - if (id < 0) - { - id = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); - if (id < 0) - { - fprintf(stderr, "Cannot create file %s.\n", filename); - return(1); - } - } - - close(id); - -#ifdef WIN32 - now = time(NULL); - fnow.actime = now; - fnow.modtime = now; - (int) utime(filename, &fnow); -#else - (int) utimes(filename, NULL); -#endif - - return 0; -} - int main(int argc, char* argv[]) { char* path1; @@ -165,10 +113,9 @@
while (csec != NULL) { - if (mkdir_p(csec) > 0) - exit(1); + mkdir_p(csec); csec = strtok(NULL, DIR_SEPARATOR_STRING); } - - exit(write_created_file()); + + exit(0); } _____
Modified: branches/xmlbuildsystem/reactos/tools/tools.mak --- branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,7 +1,3 @@
-# We have to put rmkdir in $(INTERMEDIATE) and not $(INTERMEDIATE)tools -# since GNU make will always remake directory targets and we can't do the -# .created file trick for rmkdir due to circular dependencies - RMKDIR_BASE = tools
RMKDIR_TARGET = \ @@ -17,11 +13,11 @@
RMKDIR_HOST_LFLAGS = -g
-$(RMKDIR_TARGET): $(RMKDIR_OBJECTS) +$(RMKDIR_TARGET): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_OBJECTS) $(ECHO_LD) ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET)
-$(INTERMEDIATE)rmkdir.o: $(RMKDIR_BASE)$(SEP)rmkdir.c +$(INTERMEDIATE)rmkdir.o: $(INTERMEDIATE_NO_SLASH) $(RMKDIR_BASE)$(SEP)rmkdir.c $(ECHO_CC) ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $(RMKDIR_BASE)$(SEP)rmkdir.c -o $(INTERMEDIATE)rmkdir.o
@@ -59,7 +55,9 @@ -@$(rm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL) clean: rsym_clean
+include tools/bin2res/bin2res.mak include tools/buildno/buildno.mak +include tools/cabman/cabman.mak include tools/cdmake/cdmake.mak include tools/nci/nci.mak include tools/rbuild/rbuild.mak @@ -68,3 +66,4 @@ include tools/wmc/wmc.mak include tools/wpp/wpp.mak include tools/wrc/wrc.mak +include lib/zlib/zlib.mak _____
Deleted: branches/xmlbuildsystem/reactos/tools/tools.xml --- branches/xmlbuildsystem/reactos/tools/tools.xml 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/tools.xml 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,6 +0,0 @@
-<directory name="bin2res"> - <xi:include href="bin2res/bin2res.xml" /> -</directory> -<directory name="cabman"> - <xi:include href="cabman/cabman.xml" /> -</directory> _____
Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak --- branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,8 +1,8 @@
UNICODE_BASE = tools$(SEP)unicode
-UNICODE_BASE_DIR = $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)$(CREATED) +UNICODE_BASE_DIR = $(INTERMEDIATE)$(UNICODE_BASE)
-$(UNICODE_BASE_DIR): $(RMKDIR_TARGET) +$(UNICODE_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(UNICODE_BASE)
UNICODE_TARGET = \ _____
Modified: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak --- branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,8 +1,8 @@
WINEBUILD_BASE = tools$(SEP)winebuild
-WINEBUILD_BASE_DIR = $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)$(CREATED) +WINEBUILD_BASE_DIR = $(INTERMEDIATE)$(WINEBUILD_BASE)
-$(WINEBUILD_BASE_DIR): $(RMKDIR_TARGET) +$(WINEBUILD_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(WINEBUILD_BASE)
WINEBUILD_TARGET = \ _____
Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak --- branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,8 +1,8 @@
WMC_BASE = tools$(SEP)wmc
-WMC_BASE_DIR = $(INTERMEDIATE)$(WMC_BASE)$(SEP)$(CREATED) +WMC_BASE_DIR = $(INTERMEDIATE)$(WMC_BASE)
-$(WMC_BASE_DIR): $(RMKDIR_TARGET) +$(WMC_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(WMC_BASE)
WMC_TARGET = \ _____
Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak --- branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,6 +1,6 @@
WPP_BASE = tools$(SEP)wpp
-$(INTERMEDIATE)$(WPP_BASE): $(RMKDIR_TARGET) +$(INTERMEDIATE)$(WPP_BASE): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(WPP_BASE)
WPP_TARGET = \ _____
Modified: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak --- branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,11 +1,11 @@
WRC_BASE = tools$(SEP)wrc
-WRC_BASE_DIR = $(INTERMEDIATE)$(WRC_BASE)$(SEP)$(CREATED) +WRC_BASE_DIR = $(INTERMEDIATE)$(WRC_BASE)
-$(WRC_BASE_DIR): $(RMKDIR_TARGET) +$(WRC_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(WRC_BASE)
-WRC_BASE_PORT_DIR = $(INTERMEDIATE)$(WRC_BASE)$(SEP)port$(SEP)$(CREATED) +WRC_BASE_PORT_DIR = $(INTERMEDIATE)$(WRC_BASE)$(SEP)port
$(WRC_BASE_PORT_DIR): $(RMKDIR_TARGET) $(WRC_BASE_DIR) ${mkdir} $(INTERMEDIATE)$(WRC_BASE)$(SEP)port
-
chorns＠svn.reactos.com