Mercurial > dwindows

changeset 2778:1660b4ecb92f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win/OS2: Remove the lib and dll folders and their placeholders. Update the Windows makefile to create plaform folders automatically. Package both x86 and x64 platforms into the zip.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 28 Jun 2022 00:53:47 +0000
parents 7d7eac751f7d
children 023045e14837
files dll/placehold lib/placehold makefile.emx makefile.vac makefile.vc makefile.wpm
diffstat 6 files changed, 69 insertions(+), 89 deletions(-) [+]
line wrap: on
line diff
--- a/dll/placehold	Wed Jun 22 07:13:32 2022 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-This is a file just to keep this directory in existance in CVS.
-
--- a/lib/placehold	Wed Jun 22 07:13:32 2022 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-This is a file just to keep this directory in existance in CVS.
-
--- a/makefile.emx	Wed Jun 22 07:13:32 2022 +0000
+++ b/makefile.emx	Tue Jun 28 00:53:47 2022 +0000
@@ -31,16 +31,12 @@
 
 dw.lib: os2\dw.def
 	emximp -o dw.lib os2\dw.def
-	copy dw.dll dll
-	copy dw.lib lib
 
 dwcompat.dll:  $(COMPATOBJECTS) os2\dwcompat.def
 	$(CC) $(CFLAGS) $(DEFS) -o dwcompat.dll $(COMPATOBJECTS) $(LDFLAGS) -lsocket os2/dwcompat.def
 
 dwcompat.lib: os2\dwcompat.def
 	emximp -o dwcompat.lib os2\dwcompat.def
-	copy dwcompat.dll dll
-	copy dwcompat.lib lib
 
 dwtest.exe: dwtest.o dw.lib dwcompat.lib
 	$(CC) $(CFLAGS) -Zomf -Zmt -static-libgcc -Zlinker /pm:pm -o dwtest.exe dwtest.o -Llib -ldw -ldwcompat os2/dwtest.def
--- a/makefile.vac	Wed Jun 22 07:13:32 2022 +0000
+++ b/makefile.vac	Tue Jun 28 00:53:47 2022 +0000
@@ -2,64 +2,59 @@
 
 !if ![cmd /c os2\svnrev.cmd]
 !include SVN.REV
-!endif        
+!endif
 
 .all: \
-    .\dw.dll \
-    .\dwcompat.dll \
-    .\dwtest.exe
+	.\dw.dll \
+	.\dwcompat.dll \
+	.\dwtest.exe
 
 .c.obj:
-  icc.exe  /DOS2 /DTCPV40HDRS /DBUILD_DLL /DUNICODE /DVER_REV=$(VERREV) /I. /Tm+ /Tdc /Ss /V"Dynamic Windows Compatibility" /Ti /Gm /Gd- /G5 /Ge- /C /W3 %s
+	icc.exe  /DOS2 /DTCPV40HDRS /DBUILD_DLL /DUNICODE /DVER_REV=$(VERREV) /I. /Tm+ /Tdc /Ss /V"Dynamic Windows Compatibility" /Ti /Gm /Gd- /G5 /Ge- /C /W3 %s
 
 .\dw.dll: \
-    .\os2\dw.obj
-    @echo " Link::Linker "
-    icc.exe @<<
-    /B" /NOE /de /ST:32768 /nologo /li"
-    /Fe"dw.dll" os2\dw.def
-    .\dw.obj
-   so32dll.lib
-   tcp32dll.lib
-   libuls.lib
-   libconv.lib
-   unikbd.lib
+	.\os2\dw.obj
+	@echo " Link::Linker "
+	icc.exe @<<
+	/B" /NOE /de /ST:32768 /nologo /li"
+	/Fe"dw.dll" os2\dw.def
+	.\dw.obj
+	so32dll.lib
+	tcp32dll.lib
+	libuls.lib
+	libconv.lib
+	unikbd.lib
 <<
-  IMPLIB DW.LIB OS2\DW.DEF
-  copy dw.lib lib\dw.lib
-  copy dw.dll dll\dw.dll
+	IMPLIB DW.LIB OS2\DW.DEF
 
 .\dwcompat.dll: \
-    .\os2\dirent.obj \
-    .\dwcompat.obj
-    @echo " Link::Linker "
-    icc.exe @<<
-    /B" /NOE /de /ST:32768 /nologo /li"
-    /Fe"dwcompat.dll" os2\dwcompat.def
-    .\dirent.obj
-    .\dwcompat.obj
-   so32dll.lib
-   tcp32dll.lib
+	.\os2\dirent.obj \
+	.\dwcompat.obj
+	@echo " Link::Linker "
+	icc.exe @<<
+	/B" /NOE /de /ST:32768 /nologo /li"
+	/Fe"dwcompat.dll" os2\dwcompat.def
+	.\dirent.obj
+	.\dwcompat.obj
+	so32dll.lib
+	tcp32dll.lib
 <<
-  IMPLIB DWCOMPAT.LIB OS2\DWCOMPAT.DEF
-  copy dwcompat.lib lib\dwcompat.lib
-  copy dwcompat.dll dll\dwcompat.dll
+	IMPLIB DWCOMPAT.LIB OS2\DWCOMPAT.DEF
 
 dwtest.obj:
 	icc /Ti /DOS2 /DTCPV40HDRS /Sp1 /I. /Sm /Ss /Q /Gm /Gt /C dwtest.c
 dwtest.exe:  dwtest.obj
 	icc @<<
-	 /B" /DE /optfunc /pm:pm"
-	 /Fedwtest.exe
-	 lib\dw.lib lib\dwcompat.lib
-	 dwtest.obj
-	 os2\dwtest.def
+	/B" /DE /optfunc /pm:pm"
+	/Fedwtest.exe
+	dw.lib dwcompat.lib
+	dwtest.obj
+	os2\dwtest.def
 <<
 clean :
-        @if exist *.obj del *.obj
-        @if exist *.map del *.map
-        @if exist *.lib del *.lib
-        @if exist *.dll del *.dll
-        @if exist *.exe del *.exe
-        @if exist *.REV del *.REV
-
+	@if exist *.obj del *.obj
+	@if exist *.map del *.map
+	@if exist *.lib del *.lib
+	@if exist *.dll del *.dll
+	@if exist *.exe del *.exe
+	@if exist *.REV del *.REV
--- a/makefile.vc	Wed Jun 22 07:13:32 2022 +0000
+++ b/makefile.vc	Tue Jun 28 00:53:47 2022 +0000
@@ -6,23 +6,6 @@
 VERDOT = $(DW_MAJOR_VERSION).$(DW_MINOR_VERSION)
 VERREV = 0
 
-#
-# Setup the source and destination directories
-#
-!if "$(DWINDOWS_SRCDIR)" == ""
-SRCDIR=.
-!else
-SRCDIR=$(DWINDOWS_SRCDIR)
-!endif
-
-!if "$(DWLIBDIR)" == ""
-DWLIBDIR=.\lib
-!endif
-
-!if "$(DWDLLDIR)" == ""
-DWDLLDIR=.\dll
-!endif
-
 # Configure alternate compiler based on Clang/LLVM
 !if "$(CLANG)" == "Y"
 WLIB=llvm-lib.exe
@@ -50,6 +33,19 @@
 !endif
 !endif
 
+#
+# Setup the source and destination directories
+#
+!if "$(DWINDOWS_SRCDIR)" == ""
+SRCDIR=.
+!else
+SRCDIR=$(DWINDOWS_SRCDIR)
+!endif
+
+!if "$(DWLIBDIR)" == ""
+DWLIBDIR=$(SRCDIR)
+!endif
+
 !if "$(TARGET_CPU)" == "x86"
 PLATFORM_DEF = -DWIN32
 PLATFORM_NAME = win32
@@ -75,14 +71,12 @@
 !message Revision is [$(VERREV)]
 SVNVERSION=-DVER_REV=$(VERREV)
 !else
-
 # Check the Mercurial revision number if possible
 !if ![hg log -r . --template="VER_REV={rev}" > HG.REV]
 !include HG.REV
 !message Revision is [$(VER_REV)]
 SVNVERSION=-DVER_REV=$(VER_REV)
 !endif
-
 !endif
 
 #
@@ -133,14 +127,13 @@
 
 all: dw dwcompat dwtest
 
-
-
 clean:
 	-erase *.dll
 	-erase *.exe
 	-erase *.opt
 	-erase *.lib
 	-erase *.obj
+	-erase *.o
 	-erase *.map
 	-erase *.pdb
 	-erase *.ilk
@@ -148,11 +141,14 @@
 	-erase *.REV
 	-erase *~
 
+distclean: clean
+	-rd /s /q  $(DWLIBDIR)\x86
+	-rd /s /q  $(DWLIBDIR)\x64
+	-erase readme-win.txt
+
 dw: dw.dll
 
 dw.dll: $(OBJS) $(DEFFILE)
-	-md $(DWLIBDIR)
-	-md $(DWDLLDIR)
 	$(LINK) @<<
 -out:$(@) -def:$(DEFFILE)
 $(LINKFLAGS) $(DLLLINKFLAGS)
@@ -162,8 +158,12 @@
 	$(WLIB) -def:$(DEFFILE) -machine:$(TARGET_CPU) -out:dw.lib
 	mt.exe -manifest dw.dll.manifest $(SRCDIR)\win\dw.dll.$(TARGET_CPU).manifest -outputresource:dw.dll;2
 	-erase dw.dll.manifest
-	copy dw.lib $(DWLIBDIR)\dw.lib
-	copy dw.dll $(DWDLLDIR)\dw.dll
+	-md $(DWLIBDIR)\$(TARGET_CPU)
+	copy dw.lib $(DWLIBDIR)\$(TARGET_CPU)\dw.lib
+	copy dw.dll $(DWLIBDIR)\$(TARGET_CPU)\dw.dll
+!if exists($(WEBVIEW2LOADER))
+	copy $(WEBVIEW2LOADER) $(DWLIBDIR)\$(TARGET_CPU)\WebView2Loader.dll
+!endif
 
 dwcompat: dwcompat.dll
 
@@ -177,11 +177,9 @@
 	$(WLIB) -def:$(DEFFILE2) -machine:$(TARGET_CPU) -out:dwcompat.lib
 	mt.exe -manifest dwcompat.dll.manifest -outputresource:dwcompat.dll;2
 	-erase dwcompat.dll.manifest
-	copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib
-	copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll
-!if exists($(WEBVIEW2LOADER))
-	copy $(WEBVIEW2LOADER) $(DWDLLDIR)\WebView2Loader.dll
-!endif
+	-md $(DWLIBDIR)\$(TARGET_CPU)
+	copy dwcompat.lib $(DWLIBDIR)\$(TARGET_CPU)\dwcompat.lib
+	copy dwcompat.dll $(DWLIBDIR)\$(TARGET_CPU)\dwcompat.dll
 
 dw.obj: $(SRCDIR)\win\dw.c
 	$(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\dw.c
@@ -219,4 +217,4 @@
 
 zip: dw.dll
 	copy win\readme-win.txt .
-	zip dwindows-$(PLATFORM_NAME)-$(VERDOT).zip readme-win.txt readme.txt dw.dll dwcompat.dll dw.lib dwcompat.lib dw.h dwcompat.h
+	zip dwindows-win-$(VERDOT).zip readme-win.txt readme.txt x64\dw.dll x64\dwcompat.dll x64\dw.lib x64\dwcompat.lib x86\dw.dll x86\dwcompat.dll x86\dw.lib x86\dwcompat.lib dw.h dwcompat.h
--- a/makefile.wpm	Wed Jun 22 07:13:32 2022 +0000
+++ b/makefile.wpm	Tue Jun 28 00:53:47 2022 +0000
@@ -17,22 +17,18 @@
 
 dwcompat.dll: dirent.obj dwcompat.obj
 	wlink @os2\dwcompat.lnk name dwcompat.dll system os2v2_dll d a library $(TLKTLIB)\so32dll,$(TLKTLIB)\tcp32dll option implib=dwcompat option map option symf f $[@ f dwcompat
-	copy dwcompat.lib lib
-        copy dwcompat.dll dll
 
 dirent.obj:
 	wcc386 $(CFLAGS) os2\dirent.c
 
 dw.dll: dw.obj
 	wlink @os2\dw.lnk name dw.dll system os2v2_dll d a library $(TLKTLIB)\libuls,$(TLKTLIB)\libconv,$(TLKTLIB)\unikbd option implib=dw option map option symf f $[@
-	copy dw.lib lib
-        copy dw.dll dll
 
 dw.obj: os2\dw.c
 	wcc386 $(CFLAGS) os2\dw.c
 
 dwtest.exe: dwtest.obj
-	wlink name dwtest.exe system os2v2_pm d a library lib\dw.lib option map option symf f $[@
+	wlink name dwtest.exe system os2v2_pm d a library dw.lib option map option symf f $[@
 
 dwtest.obj:
 	wcc386 /DOS2 -i=os2 -i=$(OS22_H) -bm -bt=OS2 -zq -d2 -sg dwtest.c
@@ -44,5 +40,4 @@
 	@if exist *.lib del *.lib
 	@if exist *.dll del *.dll
 	@if exist *.exe del *.exe
-	@if exist lib\*.lib del lib\*.lib