Changeset 148 for trunk/mediafolder

Timestamp:

Jan 28, 2024, 11:17:52 PM (19 months ago)

Author:

gyoung

Message:

Automate building of all def files. Some minor code and makefile cleanup

Location:

trunk/mediafolder

Files:

• MMconfigPage/makefile (modified) (1 diff)
• ProgFolder/def.tpl (added)
• ProgFolder/makefile (modified) (2 diffs)
• ProgFolder/progFOLDER.DEF (deleted)
• c/cddb/def.tpl (added)
• c/cddb/makefile (modified) (4 diffs)
• c/cddb/pmcddb.DEF (deleted)
• c/cddb/res/def001.tpl (added)
• c/cddb/res/def007.tpl (added)
• c/cddb/res/def031.tpl (added)
• c/cddb/res/def033.tpl (added)
• c/cddb/res/def034.tpl (added)
• c/cddb/res/def039.tpl (added)
• c/cddb/res/def049.tpl (added)
• c/cddb/res/def088.tpl (added)
• c/cddb/res/makefile (modified) (11 diffs)
• c/cddb/res/pmcddb001.DEF (deleted)
• c/cddb/res/pmcddb007.DEF (deleted)
• c/cddb/res/pmcddb031.DEF (deleted)
• c/cddb/res/pmcddb033.DEF (deleted)
• c/cddb/res/pmcddb034.DEF (deleted)
• c/cddb/res/pmcddb039.DEF (deleted)
• c/cddb/res/pmcddb049.DEF (deleted)
• c/cddb/res/pmcddb088.DEF (deleted)
• c/makefile (modified) (2 diffs)
• create_mfldr_def.CMD (modified) (2 diffs)
• makefile (modified) (3 diffs)
• res/en/about_ecs_en.dlg (modified) (1 diff)
• res/makefile (modified) (2 diffs)
• res/tw/makefile (modified) (1 diff)

trunk/mediafolder/MMconfigPage/makefile

@@ -23 +23 @@
 
 distribution:
-

trunk/mediafolder/ProgFolder/makefile

@@ -65 +65 @@
 all:     progfldr.dll
 
-progfldr.dll:   $(OBJECTS) progfolder.def
+progfldr.dll:   $(OBJECTS)
+        cmd /C $(TOOLDIR)/create_def.cmd progfolder.def
         icc -Ge- /Fe$@ /Fm$*.map $(OBJECTS) progfolder.def
         rc -i $(INC2) progfolder.rc $@
@@ -90 +91 @@
         -rm *.dll
         -rm *.lib
+        -rm *.def
 
 cleaner:

trunk/mediafolder/c/cddb/makefile

@@ -17 +17 @@
 BINDIR          =       ../../dist/bin
 HELPERDIR       =       ..\helper
+#TOOLDIR =      $(BUILD_ROOT)/classes/mm-progs
 OBJECTS         =       cddb.obj \
                         cd.obj \
@@ -83 +84 @@
                 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
 pmcddb.exe:     pmcddb.cpp $(OBJECTS) $(LIBOBJECTS) $(CDDBOBJ) $(INC)\cddb.h $(INC)\cddb.hh
+        cmd /C $(TOOLDIR)\create_def.cmd pmcddb.def
         $(CC) $(CPPFLAGS) -I$(INC) -I$(MOREINC) $< $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ) so32dll.lib TCPIP32.LIB pmcddb.def 
 
@@ -105 +107 @@
         -rm *.exe
         -rm *.dll
+        -rm *.def
         -rm $(LIBDIR)/*.obj
         -cd ./res && make clean
@@ -112 +115 @@
 
         
-

trunk/mediafolder/c/cddb/res/makefile

@@ -1 +1 @@
 # Makefile for Audio-CD copy
+include ../../../../make.inc
 
 CC           = icc
@@ -11 +12 @@
 BINDIR          =       ../../dist/bin
 HELPERDIR       =       ..\helper
-
+#TOOLDIR =      $(BUILD_ROOT)/classes/mm-progs
 CPPFILES        =
 all:     pmcddb001.dll pmcddb007.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll pmcddb033.dll pmcddb034.dll
@@ -18 +19 @@
 
 pmcddb001.dll:  pmcddb001.c pmcddb001.res
-#               gcc -Zdll -Zomf -I$(INC) pmcddb001.c pmcddb001.def
+                cmd /C $(TOOLDIR)/create_def.cmd pmcddb001.def def001.tpl
                 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb001.c pmcddb001.def
                 rc pmcddb001.res pmcddb001.dll
@@ -26 +27 @@
 
 pmcddb007.dll:  pmcddb007.c pmcddb007.res
-#               gcc -Zdll -Zomf -I$(INC) pmcddb007.c pmcddb007.def
+                cmd /C $(TOOLDIR)/create_def.cmd pmcddb007.def def007.tpl
                 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb007.c pmcddb007.def
                 rc pmcddb007.res pmcddb007.dll
@@ -34 +35 @@
                 
 pmcddb049.dll:  pmcddb049.c pmcddb049.res
-#               gcc -Zdll -Zomf -I$(INC) pmcddb049.c pmcddb049.def
+                cmd /C $(TOOLDIR)/create_def.cmd pmcddb049.def def049.tpl
                 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb049.c pmcddb049.def
                 rc pmcddb049.res pmcddb049.dll
@@ -42 +43 @@
 
 pmcddb031.dll:  pmcddb031.c pmcddb031.res
-#               gcc -Zdll -Zomf -I$(INC) pmcddb031.c pmcddb031.def
+                cmd /C $(TOOLDIR)/create_def.cmd pmcddb031.def def031.tpl
                 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb031.c pmcddb031.def
                 rc pmcddb031.res pmcddb031.dll
@@ -50 +51 @@
 
 pmcddb039.dll:  pmcddb039.c pmcddb039.res
-#               gcc -Zdll -Zomf -I$(INC) pmcddb039.c pmcddb039.def
+                cmd /C $(TOOLDIR)/create_def.cmd pmcddb039.def def039.tpl
                 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb039.c pmcddb039.def
                 rc pmcddb039.res pmcddb039.dll
@@ -58 +59 @@
 
 pmcddb088.dll:  pmcddb088.c pmcddb088.res
-#               gcc -Zdll -Zomf -I$(INC) pmcddb088.c pmcddb088.def
+                cmd /C $(TOOLDIR)/create_def.cmd pmcddb088.def def088.tpl
                 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb088.c pmcddb088.def
                 rc pmcddb088.res pmcddb088.dll
@@ -66 +67 @@
 
 pmcddb033.dll:  pmcddb033.c pmcddb033.res
-#               gcc -Zdll -Zomf -I$(INC) pmcddb033.c pmcddb033.def
+                cmd /C $(TOOLDIR)/create_def.cmd pmcddb033.def def033.tpl
                 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb033.c pmcddb033.def
                 rc pmcddb033.res pmcddb033.dll
@@ -74 +75 @@
 
 pmcddb034.dll:  pmcddb034.c pmcddb034.res
-#               gcc -Zdll -Zomf -I$(INC) pmcddb034.c pmcddb034.def
+                cmd /C $(TOOLDIR)/create_def.cmd pmcddb034.def def034.tpl
                 $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb034.c pmcddb034.def
                 rc pmcddb034.res pmcddb034.dll
@@ -85 +86 @@
         -rm *.dll
         -rm *.RES
+        -rm *.def
 
 cleaner:

trunk/mediafolder/c/makefile

@@ -10 +10 @@
 
 clean:
-        -cd ./createcd && make clean
+        -cd ./createcd && make clean && -cd ..
         -cd ./cddb && make clean
 
 cleaner:
-        -cd ./mediafldr && make cleaner
-        -cd ./m3ufolder && make cleaner
-        -cd ./cdfldr && make cleaner
-        -cd ./audioshadow && make cleaner
-        -cd ./helper && make cleaner
-        -cd ./createcd && make cleaner
+        -cd ./mediafldr && make cleaner && -cd ..
+        -cd ./m3ufolder && make cleaner && -cd ..
+        -cd ./cdfldr && make cleaner && -cd ..
+        -cd ./audioshadow && make cleaner && -cd ..
+        -cd ./helper && make cleaner && -cd ..
+        -cd ./createcd && make cleaner && -cd ..
         -cd ./cddb && make cleaner
 
@@ -27 +27 @@
 
 distribution:
-

trunk/mediafolder/create_mfldr_def.CMD

@@ -9 +9 @@
 if theVersion="" THEN theVersion=0.0.0
 
-def="; mediafolder.DEF: DEF-file for mediafld.dll"||'0d'x||'0a'x
+def="; mediafolder.def: DEF-file for mediafld.dll"||'0d'x||'0a'x
 def=def||";"||'0d'x||'0a'x
-def=def||";                    (C) Chris Wohlgemuth 2002-"||WORD(DATE(), 3)  ||'0d'x||'0a'x
+def=def||";                    (C) Chris Wohlgemuth 2002-205 Netlabs CWMM Team 2023-"||WORD(DATE(), 3)  ||'0d'x||'0a'x
 def=def||";/*"||'0d'x||'0a'x
 def=def||"; * This program is free software; you can redistribute it and/or modify"||'0d'x||'0a'x
@@ -28 +28 @@
 def=def||"; */"||'0d'x||'0a'x
 def=def||";/*"||'0d'x||'0a'x
-def=def||"; * If you need another license for your project/product contact me at"||'0d'x||'0a'x
-def=def||"; * "||'0d'x||'0a'x
-def=def||"; * http://www.os2world.com/cdwriting"||'0d'x||'0a'x
-def=def||"; * http://www.geocities.com/SiliconValley/Sector/5785/"||'0d'x||'0a'x
-def=def||"; */"||'0d'x||'0a'x
 
 def=def||'0d'x||'0a'x

trunk/mediafolder/makefile

@@ -79 +79 @@
         prog_tutorial\mediafldrprog.inf ./c/createcd/createcd.exe
         cd ./c/cddb && make
-        cd ./progfolder && make
+#       cd ./progfolder && make
         -cd ./help && make
 
@@ -123 +123 @@
         $(COMPILE)
 
-mediafld.dll:   $(OBJECTS) progfolder\progfolder.def $(INC)\mediafolderres.h ./res/mediafolder.res
+mediafld.dll:   $(OBJECTS) $(INC)\mediafolderres.h ./res/mediafolder.res
                 -cd ../. && make bld
-                @create_mfldr_def.CMD mediafolder.DEF
+                -cd ProgFolder && make
+                @create_mfldr_def.CMD mediafolder.def
                 implib /NOLOGO lib\progfldr.lib progfolder\progfolder.def
                 icc -Ge- /Q+ /D$(ECS) /Fe$@ /Fm$*.map $(OBJECTS) lib/progfldr.lib $(LIBS) mediafolder.def
@@ -185 +186 @@
         -rm *.map
         -rm *.sym
+        -rm *.def
         -cd prog_tutorial && rm *.inf
         -cd ./res && make clean

trunk/mediafolder/res/en/about_ecs_en.dlg

@@ -1 @@
-#define VER_STRING "Media-Ordner V" \
+#define VER_STRING "Media Folder V" \
 MFLDR_VERSION \
 BUILD_STRING

trunk/mediafolder/res/makefile

@@ -23 +23 @@
 nlv:            $(OBJDIR)/version.h
                 @echo "[35;1;mCreating laguage files.[0;m"
-                @for i in $(LANGUAGES); \
-                do \
-                        echo "[33;1;m Creating mfldr_"$$i".dll[0;m";  \
-                        make LANGUAGE=$$i $(OBJDIR)/mfldr_$$i.dll ; \
-                done
+                @for %i in ($(LANGUAGES)) do (echo Creating mfldr_%i.dll && make LANGUAGE=%i $(OBJDIR)/mfldr_%i.dll)
 
 
 $(OBJDIR)/version.h:    ../../build.inc
-                @echo '#define MFLDR_VERSION "'$(VERSION_STRING)'"\n#define MFLDR_AUTHOR "'$(AUTHOR_STRING)'"' > $(OBJDIR)/version.h
-                @echo '#define BUILD_STRING "'$(BUILD_STRING)'"' > $(OBJDIR)/build.h
-
+                
+                @echo #define MFLDR_VERSION "$(VERSION_STRING)" > $(OBJDIR)/version.h
+                @echo #define MFLDR_AUTHOR $(AUTHOR_STRING) >> $(OBJDIR)/version.h
+                @echo #define BUILD_STRING "$(BUILD_STRING)" > $(OBJDIR)/build.h
+                
 #### Resource DLL ####
 $(OBJDIR)/mfldr_$(LANGUAGE).dll:        ./$(LANGUAGE)/mediafolder_$(LANGUAGE).c \
@@ -67 +65 @@
 
         
-

trunk/mediafolder/res/tw/makefile

@@ -15 +15 @@
 
         
-