fix cross-compilation build of fixstrs.exe

the format of the response file depends on the compiler used, which is not generally correct for cross-compilation
the program has been modified to define the file format via a command line option, making the file creation transparent and defined to be correct for currently used tool

clean.bat

@@ -11,7 +11,7 @@ call %0 .\ command.com command.upx
 call %0 .\ lastmake.mk context.h_c context.inc strings.h infores info.txt gnuconf.mak
 call %0 criter\ criter criter1 context.def context.inc context.h_c
 call %0 strings\ command.cln xmsswap.cln strings.h strings.err strings.dat strings.log
-call %0 strings\strings\ makefile 
+call %0 strings\strings\ makefile strings.mak
 call %0 strings\strings\*. c
 call %0 tools\ makefile.mak
 call %0 tools\*. icd

clean.sh

@@ -9,7 +9,7 @@ rm -f command.com command.upx
 rm -f lastmake.mk context.h_c context.inc strings.h infores info.txt
 cd strings    && rm -f strings.h strings.err strings.dat strings.log
 cd ../criter  && rm -f criter criter1 context.def context.inc context.h_c
-cd ../strings/strings && rm -f *.c makefile
+cd ../strings/strings && rm -f *.c makefile strings.mak
 cd ../../tools && rm -f makefile.mak *.icd
 cd ..
 for i in cmd lib strings strings/strings; do rm -f $i/*.lib $i/*.lst; done

config.std

@@ -13,6 +13,8 @@ SCRIPTS_PATH = ..\..\scripts
 !endif
 RMFILES = $(SCRIPTS_PATH)\rmfiles
 
+FIXSTRSOPT = --lib
+
 ## Where the pre-compiled SUPPL files are located
 ## See DOCS\SUPPL.TXT for more information about this library
 SUPPL_INC_PATH = ..$(DIRSEP)suppl

mkfiles/bc5.mak

@@ -13,6 +13,8 @@ LD = $(BINPATH)\Tlink /m/s/l /c/d /i @$(LD_RSP)
 OBJC0 = $(LIBPATH)\c0$(SHELL_MMODEL).obj
 LIBC = $(LIBPATH)\c$(SHELL_MMODEL).lib
 
+FIXSTRSOPT = --lib1
+
 CFG = TURBOC.CFG
 CFLAGS1 = -1- -a -f- -ff- -K -w+ -O -Z
 CFLAGS2 = -b- -v -L$(LIBPATH)

mkfiles/tc2.mak

@@ -11,6 +11,8 @@ LD = $(BINPATH)\Tlink /m/s/l /c/d @$(LD_RSP)
 OBJC0 = $(LIBPATH)\c0$(SHELL_MMODEL).obj
 LIBC = $(LIBPATH)\c$(SHELL_MMODEL).lib
 
+FIXSTRSOPT = --lib2
+
 CFG = TURBOC.CFG
 CFLAGS1 = -1- -a- -f- -ff- -K -w+ -O -Z
 CFLAGS2 = -L$(LIBPATH)

mkfiles/turbocpp.mak

@@ -13,6 +13,8 @@ LD = $(BINPATH)\Tlink /m/s/l /c/d @$(LD_RSP)
 OBJC0 = $(LIBPATH)\c0$(SHELL_MMODEL).obj
 LIBC = $(LIBPATH)\c$(SHELL_MMODEL).lib
 
+FIXSTRSOPT = --lib2
+
 CFG = TURBOC.CFG
 CFLAGS1 = -1- -a -f- -ff- -K -w+ -O -Z
 CFLAGS2 = -b- -L$(LIBPATH)

strings/fixstrs.c

@@ -101,6 +101,7 @@ static char *strupr(char *s)
 #define fEXT ".lng"
 #define fDMAKEFILE "makefile"
 #define fTCMAKEFILE "strings.rsp"
+#define fTCMAKFILE "strings.mak"
 
 typedef enum STATE {
 	 LOOKING_FOR_START
@@ -644,6 +645,47 @@ int loadFile(const char * const fnam)
 	return 0;
 }
 
+static int create_make_dependency(void)
+{
+	string_count_t cnt1;
+	string_count_t maxCnt1;
+	string_count_t cnt2;
+
+	strcpy(cfilename, fTCMAKFILE);
+	if((lgf = fopen(cfile, "wt")) == NULL) {
+		pxerror("creating ", cfile);
+		return 101;
+	}
+	cnt1 = maxCnt1 = cnt2 = 0;
+	for(cnt = 0; cnt < maxCnt; ++cnt) {
+		if( cnt1 == 0 ) {
+			if( cnt > 0 )
+				fprintf(lgf, "\n");
+			fprintf(lgf, "strings_deps%d : \\\n", maxCnt1++);
+			cnt2 = 0;
+		}
+		fprintf(lgf, " " objfmt, cnt);
+		if(++cnt1 > 127) {
+			cnt1 = 0;
+		}
+		if(++cnt2 > 7 && cnt1 > 0) {
+			fprintf(lgf, " \\\n");
+			cnt2 = 0;
+		}
+	}
+	for(cnt = 0; cnt < maxCnt1; ++cnt) {
+		if( cnt == 0 )
+			fprintf(lgf, "\nSTRINGS_DEPS =");
+		fprintf(lgf, " strings_deps%d", cnt);
+	}
+	fflush(lgf);
+	if(ferror(lgf)) {
+		puts("Unspecific error writing to " fTCMAKFILE);
+		return 104;
+	}
+	fclose(lgf);
+	return 0;
+}
 
 int main(int argc, char **argv)
 {
@@ -653,18 +695,42 @@ int main(int argc, char **argv)
 	string_count_t cnt;		/* current string number */
 	string_size_t lsize;
 	int makeLib = 0;
+	const char *fmt;
 
 	unlink(logfile);
 
-	if(argv[1] && (stricmp(argv[1], "/lib") == 0 || stricmp(argv[1], "--lib") == 0)) {
-		--argc;
-		++argv;
-		makeLib = 1;
+	while(argv[1] != NULL ) {
+		if(stricmp(argv[1], "/lib") == 0 || stricmp(argv[1], "--lib") == 0) {
+			--argc;
+			++argv;
+			makeLib = 1;
+		} else if(stricmp(argv[1], "/lib1") == 0 || stricmp(argv[1], "--lib1") == 0) {
+			--argc;
+			++argv;
+			makeLib = 2;
+		} else if(stricmp(argv[1], "/lib2") == 0 || stricmp(argv[1], "--lib2") == 0) {
+			--argc;
+			++argv;
+			makeLib = 3;
+		} else {
+			break;
+		}
 	}
 
-	if(argc > 2) {
+	/*
+	 * Hidden options lib and lib1 and lib2
+	 *
+	 * if one of these option is used then program generate strings library
+	 * source files and generate make files and response file for make utility
+	 *
+	 * lib.. options control response file format
+	 * lib2  format is '+<file name> &'
+	 * lib1  format is '+<file name>'
+	 * lib   format is '<file name>' only
+	 */
+	if(argc > 2 ) {
 		puts("FIXSTRS - Generate STRINGS.DAT and STRINGS.H for a language\n"
-			"Useage: FIXSTRS [/lib] [language]\n"
+			"Useage: FIXSTRS [/lib|/lib1|/lib2] [language]\n"
 			"\tIf no language is specified, only the default strings are read.\n"
 			"\tThe <language>.LNG file must reside in the current directory.\n"
 			"Note: DEFAULT.lng must be present in the current directory, too.");
@@ -822,6 +888,8 @@ puts("FIXSTRS: building STRINGS resource");
 			pxerror("creating ", cfile);
 			return 100;
 		}
+		if((rc = create_make_dependency()) != 0)
+			return rc;
 		strcpy(cfilename, fTCMAKEFILE);
 		if((ftc101 = fopen(cfile, "wt")) == NULL) {
 			pxerror("creating ", cfile);
@@ -847,19 +915,27 @@ strings.lib .LIBRARY : ", fdmake);
 			dumpString(cnt);
 			fprintf(fdmake, "\\\n\t" objfmt, cnt);
 		}
-		for(cnt = 0; cnt < maxCnt - 1; ++cnt)
-#if defined(__TURBOC__)
-			fprintf(ftc101, "+" objfmt " &\n", cnt);
-#elif defined(GCC)
-			fprintf(ftc101, objfmt "\n", cnt);
-#else
-			fprintf(ftc101, "+" objfmt "\n", cnt);
-#endif
-#if defined(GCC)
-		fprintf(ftc101, objfmt " \n", cnt);
-#else
-		fprintf(ftc101, "+" objfmt " \n", cnt);
-#endif
+		if(makeLib == 3) {
+			/* Turbo C */
+			fmt = "+" objfmt " &\n";
+		} else if(makeLib == 2) {
+			/* Borland C */
+			fmt = "+" objfmt "\n";
+		} else {
+			/* GCC, Open Watcom */
+			fmt = objfmt "\n";
+		}
+		for(cnt = 0; cnt < maxCnt - 1; ++cnt) {
+			fprintf(ftc101, fmt, cnt);
+		}
+		if(makeLib > 1) {
+			/* Borland C, Turbo C */
+			fmt = "+" objfmt "\n";
+		} else {
+			/* GCC, Open Watcom */
+			fmt = objfmt "\n";
+		}
+		fprintf(ftc101, fmt, cnt);
 		/********************** epilogue */
 
 		fputs("\n\

strings/makefile.mak

@@ -8,7 +8,7 @@ TOP = ..
 all : $(CFG) strings.h strings.err fixstrs.exe
 
 strings.h : DEFAULT.lng
-	..$(DIRSEP)utilsc$(DIRSEP)fixstrs.exe --lib $(LNG)
+	..$(DIRSEP)utilsc$(DIRSEP)fixstrs.exe $(FIXSTRSOPT) $(LNG)
 	$(CP) strings.h ..
 
 strings.err : DEFAULT.err

strings/strings/makefile.mak

@@ -6,46 +6,9 @@ TOP = ../..
 
 all : $(CFG) strings.lib
 
-OBJS1 = str0000.obj str0001.obj str0002.obj str0003.obj str0004.obj str0005.obj str0006.obj str0007.obj
-OBJS2 = str0008.obj str0009.obj str000a.obj str000b.obj str000c.obj str000d.obj str000e.obj str000f.obj
-OBJS3 = str0010.obj str0011.obj str0012.obj str0013.obj str0014.obj str0015.obj str0016.obj str0017.obj
-OBJS4 = str0018.obj str0019.obj str001a.obj str001b.obj str001c.obj str001d.obj str001e.obj str001f.obj
-OBJS5 = str0020.obj str0021.obj str0022.obj str0023.obj str0024.obj str0025.obj str0026.obj str0027.obj
-OBJS6 = str0028.obj str0029.obj str002a.obj str002b.obj str002c.obj str002d.obj str002e.obj str002f.obj
-OBJS7 = str0030.obj str0031.obj str0032.obj str0033.obj str0034.obj str0035.obj str0036.obj str0037.obj
-OBJS8 = str0038.obj str0039.obj str003a.obj str003b.obj str003c.obj str003d.obj str003e.obj str003f.obj
-OBJS9 = str0040.obj str0041.obj str0042.obj str0043.obj str0044.obj str0045.obj str0046.obj str0047.obj
-OBJS10 = str0048.obj str0049.obj str004a.obj str004b.obj str004c.obj str004d.obj str004e.obj str004f.obj
-OBJS11 = str0050.obj str0051.obj str0052.obj str0053.obj str0054.obj str0055.obj str0056.obj str0057.obj
-OBJS12 = str0058.obj str0059.obj str005a.obj str005b.obj str005c.obj str005d.obj str005e.obj str005f.obj
-OBJS13 = str0060.obj str0061.obj str0062.obj str0063.obj str0064.obj str0065.obj str0066.obj str0067.obj
-OBJS14 = str0068.obj str0069.obj str006a.obj str006b.obj str006c.obj str006d.obj str006e.obj str006f.obj
-OBJS15 = str0070.obj str0071.obj str0072.obj str0073.obj str0074.obj str0075.obj str0076.obj str0077.obj
-OBJS16 = str0078.obj str0079.obj str007a.obj str007b.obj str007c.obj str007d.obj str007e.obj str007f.obj
-OBJS17 = str0080.obj str0081.obj str0082.obj str0083.obj str0084.obj str0085.obj str0086.obj str0087.obj
-OBJS18 = str0088.obj str0089.obj str008a.obj str008b.obj str008c.obj str008d.obj str008e.obj str008f.obj
-OBJS19 = str0090.obj str0091.obj str0092.obj str0093.obj str0094.obj str0095.obj str0096.obj str0097.obj
-OBJS20 = str0098.obj str0099.obj str009a.obj str009b.obj str009c.obj str009d.obj str009e.obj str009f.obj
-OBJS21 = str00a0.obj str00a1.obj str00a2.obj str00a3.obj str00a4.obj str00a5.obj str00a6.obj str00a7.obj
-OBJS22 = str00a8.obj str00a9.obj str00aa.obj str00ab.obj str00ac.obj str00ad.obj str00ae.obj str00af.obj
-OBJS23 = str00b0.obj str00b1.obj str00b2.obj str00b3.obj str00b4.obj str00b5.obj str00b6.obj str00b7.obj
-OBJS24 = str00b8.obj str00b9.obj str00ba.obj str00bb.obj str00bc.obj str00bd.obj str00be.obj str00bf.obj
-OBJS25 = str00c0.obj str00c1.obj str00c2.obj str00c3.obj str00c4.obj str00c5.obj str00c6.obj str00c7.obj
-OBJS26 = str00c8.obj str00c9.obj str00ca.obj str00cb.obj str00cc.obj str00cd.obj str00ce.obj str00cf.obj
-OBJS27 = str00d0.obj str00d1.obj str00d2.obj str00d3.obj str00d4.obj str00d5.obj str00d6.obj str00d7.obj
-OBJS28 = str00d8.obj str00d9.obj str00da.obj str00db.obj str00dc.obj str00dd.obj str00de.obj str00df.obj
-OBJS29 = str00e0.obj str00e1.obj str00e2.obj str00e3.obj str00e4.obj str00e5.obj str00e6.obj str00e7.obj
-OBJS30 = str00e8.obj str00e9.obj str00ea.obj str00eb.obj str00ec.obj str00ed.obj str00ee.obj str00ef.obj
-OBJS31 = str00f0.obj str00f1.obj str00f2.obj str00f3.obj str00f4.obj str00f5.obj str00f6.obj str00f7.obj
-OBJS32 = str00f8.obj str00f9.obj str00fa.obj str00fb.obj str00fc.obj str00fd.obj str00fe.obj
+!include "strings.mak"
 
-strings_deps1 : $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) $(OBJS6) $(OBJS7) $(OBJS8) \
-$(OBJS9) $(OBJS10) $(OBJS11) $(OBJS12) $(OBJS13) $(OBJS14) $(OBJS15) $(OBJS16) $(OBJS17)
-
-strings_deps2 : $(OBJS18) $(OBJS19) $(OBJS20) $(OBJS21) $(OBJS22) $(OBJS23) $(OBJS24) \
-$(OBJS25) $(OBJS26) $(OBJS27) $(OBJS28) $(OBJS29) $(OBJS30) $(OBJS31) $(OBJS32)
-
-strings.lib: ../strings.h ../strings.err strings_deps1 strings_deps2
+strings.lib: ../strings.h ../strings.err $(STRINGS_DEPS)
 	echo Making STRINGS library
 	$(RMFILES) strings.lib
 	$(AR) strings.lib @strings.rsp $(LIBLIST) strings.lst