doing some maintenance on the posix build system, getting in sync with reactos base.

svn path=/trunk/; revision=3940

posix/apps/baresh/Makefile

@@ -1,47 +1,30 @@
-# $Id: Makefile,v 1.8 2002/12/26 18:28:25 robd Exp $
+# $Id: Makefile,v 1.9 2003/01/05 18:27:19 robd Exp $
 #
-# Tu run it in Win32 console mode, undefine __SUBSYSTEM_WINDOWS__
+# To run it in Win32 console mode, undefine __SUBSYSTEM_WINDOWS__
 # and pass "console" in the ld's --subsystem option.
 # 
 #
-PATH_TO_TOP=../../../reactos
 
-PATH_TO_PSX_TOP=../..
+PATH_TO_TOP = ../../../reactos
 
-TARGET_NAME=baresh
+PATH_TO_PSX_TOP = ../..
 
-CFLAGS=-D__SUBSYSTEM_WINDOWS__
+TARGET_TYPE = program
 
-OBJECTS=sh.o $(TARGET_NAME).coff
+#TARGET_APPTYPE = console
+TARGET_APPTYPE = windows
 
-LIBRARIES=\
-	$(PATH_TO_PSX_TOP)/lib/crt0w32.o \
-	$(PATH_TO_PSX_TOP)/lib/psxdll/psxdll.a
+TARGET_NAME = baresh
 
-$(TARGET_NAME): $(OBJECTS) $(LIBRARIES)
-	$(CC) \
-		$(CFLAGS) \
-		$(OBJECTS) \
-		$(LIBRARIES)\
-		-o $@ \
-		-Wl,--subsystem,windows\
-		-nostartfiles \
-		-nostdlib
-
-$(TARGET_NAME).coff: sh.rc
-	$(RC) \
-		--include-dir $(PATH_TO_TOP)/include \
-		--output-format coff \
-		$< $@ 
-
-clean:
-	- $(RM) *.o
-	- $(RM) *.exe
-	- $(RM) *.coff
-	- $(RM) *.sym
+TARGET_CFLAGS = -D__SUBSYSTEM_WINDOWS__
 
+TARGET_LIBS = $(PATH_TO_PSX_TOP)/lib/crt0w32.o \
+	      $(PATH_TO_TOP)/dk/psx/lib/psxdll.a
 
+TARGET_OBJECTS = sh.o
 
 include $(PATH_TO_TOP)/rules.mak
 
+include $(TOOLS_PATH)/helper.mk
+
 # EOF

posix/apps/baresh/baresh.rc

@@ -0,0 +1,38 @@
+#include <defines.h>
+#include <reactos/resource.h>
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION	RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+	PRODUCTVERSION	RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD	
+	FILEFLAGSMASK	0x3fL
+#ifdef _DEBUG
+	FILEFLAGS	0x1L
+#else
+	FILEFLAGS	0x0L
+#endif
+	FILEOS		0x40004L
+	FILETYPE	0x2L
+	FILESUBTYPE	0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",	RES_STR_COMPANY_NAME
+            VALUE "FileDescription",	"Bare sh for POSIX+\0"
+            VALUE "FileVersion",	RES_STR_FILE_VERSION
+            VALUE "InternalName",	"sh\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"sh\0"
+            VALUE "ProductName",	RES_STR_PRODUCT_NAME
+            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+

posix/apps/posixw32/Makefile

@@ -1,20 +1,26 @@
-# $Id: Makefile,v 1.3 2002/10/29 04:44:59 rex Exp $
+# $Id: Makefile,v 1.4 2003/01/05 18:27:19 robd Exp $
 #
 # Win32 Terminal Emulator for the POSIX+ subsystem.
 #
-PATH_TO_TOP=../../../reactos
-PATH_TO_TOP_PSX=../..
 
-TARGET_NAME=posixw32
-TARGET_TYPE=program
-TARGET_APPTYPE=console
-TARGET_CFLAGS =-I$(PATH_TO_TOP_PSX)/include
-TARGET_SDKLIBS=ntdll.a kernel32.a
-TARGET_OBJECTS=\
+PATH_TO_TOP = ../../../reactos
+
+PATH_TO_TOP_PSX = ../..
+
+TARGET_NAME = posixw32
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = console
+
+TARGET_CFLAGS = -I$(PATH_TO_TOP_PSX)/include
+
+TARGET_SDKLIBS = ntdll.a kernel32.a
+
+TARGET_OBJECTS = \
 	$(TARGET_NAME).o \
 	console.o \
-	vt100.o \
-	$(TARGET_NAME).coff
+	vt100.o
 
 include $(PATH_TO_TOP)/rules.mak