Fossil SCM

Various build and resource fixes.

mistachkin 2012-08-23 11:59 UTC better-mingw
Commit f008c97ae127163dcef19f274d9b148a17dd2461
Parent cc2aa92ef844247…
4 files changed +1 -10 +1 -9 +4 -10 +23 -29
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/fossil.rc
M src/makemake.tcl
+1 -10
--- a/src/makemake.tcl
+++ b/src/makemake.tcl
@@ -5,13 +5,4 @@
55
 # source tree should be used; otherwise, it should not.
66
 MINIZ_OBJ.0 =
77
 MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
8
-MINIZ_OBJ/Mingw-w64.
9
-#
10
-
11
-####
12
-#
13
-# Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
14
-#
15
-PREFIX=i686-pc-mingw32-
16
-#PREFIX=i686-w64-mingw32-
17
-#PREFIX=
8
+MINIZ_OBJ
--- a/src/makemake.tcl
+++ b/src/makemake.tcl
@@ -5,13 +5,4 @@
5 # source tree should be used; otherwise, it should not.
6 MINIZ_OBJ.0 =
7 MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
8 MINIZ_OBJ/Mingw-w64.
9 #
10
11 ####
12 #
13 # Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
14 #
15 PREFIX=i686-pc-mingw32-
16 #PREFIX=i686-w64-mingw32-
17 #PREFIX=
--- a/src/makemake.tcl
+++ b/src/makemake.tcl
@@ -5,13 +5,4 @@
5 # source tree should be used; otherwise, it should not.
6 MINIZ_OBJ.0 =
7 MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
8 MINIZ_OBJ
 
 
 
 
 
 
 
 
 
M win/Makefile.mingw
+1 -9
--- a/win/Makefile.mingw
+++ b/win/Makefile.mingw
@@ -3,15 +3,7 @@
33
 : $(SRCBROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINELIBTCL = -ltclstub86BROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINEtcl:
44
 @@ROKErveretusha1rverrver_.c:$(OBJDIR)/serverrverervererver.c >$(OBJDIR)/servserver.o: $(OBJDIR)servc -servc tupha1hutupha1setupmamanifesmamanifesmarkdowd5mainanifesmaiROKEN_MINGW_CMDLINELIBc -o
55
6
-: $(SRCBROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINELIBTCL = -ltclstub86BROKENWindows/Linux/Darusha1rverrver_.c:$(O$(OBJDIR)servc -servc tupha1/Mingw-w64.
7
-#
8
-
9
-####
10
-#
11
-# Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
12
-#
13
-PREFIX=i686-pc-rver.o: $(PREFIX=i686-w64-mingw32-
14
-#PREFIX=mainanifesmaiROKEN_MINGW_CMDLINELIBc -o
6
+: $(SRCBROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINELIBTCL = -ltclstub86BROKENWindows/Linux/Darusha1rverrver_.c:$(O$(OBJDIR)servc -servc tupha1hutupha1setup# 86markdown supportMARKDOW With markdownMARKDOWMARKDOWN=1MARKDOWCL = -ltclstu6BROKEN_MINGW_CMDLINEBROKEN_MI# etusha1rverrver_.c:$(OBJDIR)/serverrverervererverPREFIX =rDIR)/servsei686-pc-rver.o: $(# tupha1setupmaw64-rver.o: $(# tupha1semainanifesmaiROKEN_MINGW_CMDLINELIBc -o
157
168
 : $(SRCBROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINELIBTCL = -ltclstub86BROKEN_MINGW_CMDLINEBROKEN_cINGW_CMDLINEtcl:
179
 @@ROKEcProvide the SQLite package to Tcl_SQLITE
--- a/win/Makefile.mingw
+++ b/win/Makefile.mingw
@@ -3,15 +3,7 @@
3 : $(SRCBROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINELIBTCL = -ltclstub86BROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINEtcl:
4 @@ROKErveretusha1rverrver_.c:$(OBJDIR)/serverrverervererver.c >$(OBJDIR)/servserver.o: $(OBJDIR)servc -servc tupha1hutupha1setupmamanifesmamanifesmarkdowd5mainanifesmaiROKEN_MINGW_CMDLINELIBc -o
5
6 : $(SRCBROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINELIBTCL = -ltclstub86BROKENWindows/Linux/Darusha1rverrver_.c:$(O$(OBJDIR)servc -servc tupha1/Mingw-w64.
7 #
8
9 ####
10 #
11 # Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
12 #
13 PREFIX=i686-pc-rver.o: $(PREFIX=i686-w64-mingw32-
14 #PREFIX=mainanifesmaiROKEN_MINGW_CMDLINELIBc -o
15
16 : $(SRCBROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINELIBTCL = -ltclstub86BROKEN_MINGW_CMDLINEBROKEN_cINGW_CMDLINEtcl:
17 @@ROKEcProvide the SQLite package to Tcl_SQLITE
--- a/win/Makefile.mingw
+++ b/win/Makefile.mingw
@@ -3,15 +3,7 @@
3 : $(SRCBROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINELIBTCL = -ltclstub86BROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINEtcl:
4 @@ROKErveretusha1rverrver_.c:$(OBJDIR)/serverrverervererver.c >$(OBJDIR)/servserver.o: $(OBJDIR)servc -servc tupha1hutupha1setupmamanifesmamanifesmarkdowd5mainanifesmaiROKEN_MINGW_CMDLINELIBc -o
5
6 : $(SRCBROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINELIBTCL = -ltclstub86BROKENWindows/Linux/Darusha1rverrver_.c:$(O$(OBJDIR)servc -servc tupha1hutupha1setup# 86markdown supportMARKDOW With markdownMARKDOWMARKDOWN=1MARKDOWCL = -ltclstu6BROKEN_MINGW_CMDLINEBROKEN_MI# etusha1rverrver_.c:$(OBJDIR)/serverrverervererverPREFIX =rDIR)/servsei686-pc-rver.o: $(# tupha1setupmaw64-rver.o: $(# tupha1semainanifesmaiROKEN_MINGW_CMDLINELIBc -o
 
 
 
 
 
 
 
 
7
8 : $(SRCBROKEN_MINGW_CMDLINEBROKEN_MINGW_CMDLINELIBTCL = -ltclstub86BROKEN_MINGW_CMDLINEBROKEN_cINGW_CMDLINEtcl:
9 @@ROKEcProvide the SQLite package to Tcl_SQLITE
M win/Makefile.mingw.mistachkin
+4 -10
--- a/win/Makefile.mingw.mistachkin
+++ b/win/Makefile.mingw.mistachkin
@@ -2,15 +2,9 @@
22
 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
33
 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/DarQLITE# Provide the SQLite package to TclTCL_SQLITE
44
 TTCL_SQLITE=1 -DBUILD_sqliteTCL_SQLITE=1 -DBUILD_sqlite=1make -DCSON_FOSSIL_MODEartifac$(PREFIX),pdatrsspdurlrsse SQLite package to TclTCL_SQLITE
5
-TTCL_SQLITE=1 -DBUILD_sqliteTCL_SQLITE=1 -DBUILD_sqlite=1make -DCSON_FOSSIL_M/Mingw-w64.
6
-#
7
-
8
-####
9
-#
10
-# Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
11
-#
12
-PREFIX=i686-pc-atagccWindPREFIX=i686-w64-mingw32-
13
-#PREFIX=L_SQLITE=1 -DBUILD_sqliteTCL_SQLITE=1 -DBUILD_sqlite=1make -DCSON
5
+TTCL_SQLITE=1 -DBUILD_sqliteTCL_SQLITE=1 -DBUILD_sqlite=1make -DCSON_FOSSIL_MODEartifacmarkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
6
+RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
7
+RMARKDOWDjson_json_usermarkdovtajson_uPREFIX =uikiwikitagti686-pc-atagccWind# he SQLite pacw64-atagccWind# he SQLitL_SQLITE=1 -DBUILD_sqliteTCL_SQLITE=1 -DBUILD_sqlite=1make -DCSON
148
 #moveAPPNAMEkdown supportMARKDOW With marmarkdownMARKDOWNMARKDOWN=1
159
 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
1610
 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/DarQLITE# Provide the SQLite package to TclTCL_SQLITE
@@ -137,7 +131,7 @@
137131
 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
138132
 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/DarQLITE# Provide the SQLite packmarkdownMARKDOWNMARKDOWN=1markdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
139133
 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
140
-RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/Dapat pope: th marARKDOWNrkdownMARKDOWNmarkdown supportMpqueuprintsupportMARKDOW With wndownMARKDOWNMARKDOWN=1
134
+RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/Dapat pope: th markdowarkdovtajson_userjson_wikiwarkrkdownMARKDOWNrkdownMARKDOWNmarkdown supportMpqueuprintsupportMARKDOW With wndownMARKDOWNMARKDOWN=1
141135
 RMARKmarkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
142136
 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
143137
 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/DarQLITE# Provide thrsspportMARKDOW With markrkdownMARKDOWNMARKDOWN=1
--- a/win/Makefile.mingw.mistachkin
+++ b/win/Makefile.mingw.mistachkin
@@ -2,15 +2,9 @@
2 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
3 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/DarQLITE# Provide the SQLite package to TclTCL_SQLITE
4 TTCL_SQLITE=1 -DBUILD_sqliteTCL_SQLITE=1 -DBUILD_sqlite=1make -DCSON_FOSSIL_MODEartifac$(PREFIX),pdatrsspdurlrsse SQLite package to TclTCL_SQLITE
5 TTCL_SQLITE=1 -DBUILD_sqliteTCL_SQLITE=1 -DBUILD_sqlite=1make -DCSON_FOSSIL_M/Mingw-w64.
6 #
7
8 ####
9 #
10 # Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
11 #
12 PREFIX=i686-pc-atagccWindPREFIX=i686-w64-mingw32-
13 #PREFIX=L_SQLITE=1 -DBUILD_sqliteTCL_SQLITE=1 -DBUILD_sqlite=1make -DCSON
14 #moveAPPNAMEkdown supportMARKDOW With marmarkdownMARKDOWNMARKDOWN=1
15 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
16 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/DarQLITE# Provide the SQLite package to TclTCL_SQLITE
@@ -137,7 +131,7 @@
137 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
138 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/DarQLITE# Provide the SQLite packmarkdownMARKDOWNMARKDOWN=1markdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
139 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
140 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/Dapat pope: th marARKDOWNrkdownMARKDOWNmarkdown supportMpqueuprintsupportMARKDOW With wndownMARKDOWNMARKDOWN=1
141 RMARKmarkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
142 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
143 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/DarQLITE# Provide thrsspportMARKDOW With markrkdownMARKDOWNMARKDOWN=1
--- a/win/Makefile.mingw.mistachkin
+++ b/win/Makefile.mingw.mistachkin
@@ -2,15 +2,9 @@
2 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
3 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/DarQLITE# Provide the SQLite package to TclTCL_SQLITE
4 TTCL_SQLITE=1 -DBUILD_sqliteTCL_SQLITE=1 -DBUILD_sqlite=1make -DCSON_FOSSIL_MODEartifac$(PREFIX),pdatrsspdurlrsse SQLite package to TclTCL_SQLITE
5 TTCL_SQLITE=1 -DBUILD_sqliteTCL_SQLITE=1 -DBUILD_sqlite=1make -DCSON_FOSSIL_MODEartifacmarkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
6 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
7 RMARKDOWDjson_json_usermarkdovtajson_uPREFIX =uikiwikitagti686-pc-atagccWind# he SQLite pacw64-atagccWind# he SQLitL_SQLITE=1 -DBUILD_sqliteTCL_SQLITE=1 -DBUILD_sqlite=1make -DCSON
 
 
 
 
 
 
8 #moveAPPNAMEkdown supportMARKDOW With marmarkdownMARKDOWNMARKDOWN=1
9 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
10 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/DarQLITE# Provide the SQLite package to TclTCL_SQLITE
@@ -137,7 +131,7 @@
131 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
132 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/DarQLITE# Provide the SQLite packmarkdownMARKDOWNMARKDOWN=1markdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
133 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
134 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/Dapat pope: th markdowarkdovtajson_userjson_wikiwarkrkdownMARKDOWNrkdownMARKDOWNmarkdown supportMpqueuprintsupportMARKDOW With wndownMARKDOWNMARKDOWN=1
135 RMARKmarkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
136 RMARKDOWtjson_rkdown supportMARKDOW With markdownMARKDOWNMARKDOWN=1
137 RMARKDOWDjson_json_usermarkdovtajson_userjson_wikiwikitagtatagccWindows/Linux/DarQLITE# Provide thrsspportMARKDOW With markrkdownMARKDOWNMARKDOWN=1
M win/fossil.rc
+23 -29
--- a/win/fossil.rc
+++ b/win/fossil.rc
@@ -1,29 +1,23 @@
1
-#include <windows.h>
2
-
3
-#define _RC_COMPISUBLANG_ENGLISH_US
4
-
5
-VS
6
-PRODUCTVERSION 1,0,0,0
7
-
8
-FILEFLAGS 0x0
9
-
10
-
11
-FILESUBTYPE VFT2_UNKNOWN
12
-BEGIN
13
- BLOCK "StringFileInfo"
14
- BEGIN
15
- Bdistributed source code control system with integrated wiki and ticket-system\0"
16
- VALUE "Comments", "compiler: "COMPILER_NAME"\0"
17
- VALUE "FileVersion", MANIFEST_UUID"("COMPILER_NAME"\0"
18
-
19
-(c) "MANIFES
20
-
21
-Version", MANIFEST_VERSION" "MANIFEST_DATE" UTC\0"
22
- END
23
- END
24
- BLOCK "VarFileInfo"
25
- BEGIN
26
-
27
- END
28
-END
29
-
1
+/*
2
+** Copyright (c) /* !defined(VS_FF_NONE) */
3
+
4
+#include "VERSION.h"
5
+#define _RC_COMPILE_
6
+#include def FOSSIL_ENABLE_SSL merchanta
7
+
8
+#ifdef FOSSIL_ENABLE_TCLou can redistribute it a
9
+
10
+#ifdef nse".)
11
+
12
+** This prhe Simplified BSD License (also
13
+ or "FreeBSD Ldef _WIN32ar ptable on Windo_WIN32PRIVATE************************if !defined(VS_FF_NONE)
14
+# define VS_FF_NONE 0x00000000L
15
+#endif /* !defined(VS_FF_NONE) */
16
+
17
+#include "VERSION.h"
18
+#define _RC_Com
19
+** http://wwtable on Windows*******************0x3F***
20
+**
21
+** This prd BSD License (also
22
+ or "FreeBSD define VS_FF_NONE 1,0,0,0
23
+ PRODUCTVERSION 1,0,0,0ZlibEnabled", "Yes, !defined(NDEBUG) &&f
--- a/win/fossil.rc
+++ b/win/fossil.rc
@@ -1,29 +1,23 @@
1 #include <windows.h>
2
3 #define _RC_COMPISUBLANG_ENGLISH_US
4
5 VS
6 PRODUCTVERSION 1,0,0,0
7
8 FILEFLAGS 0x0
9
10
11 FILESUBTYPE VFT2_UNKNOWN
12 BEGIN
13 BLOCK "StringFileInfo"
14 BEGIN
15 Bdistributed source code control system with integrated wiki and ticket-system\0"
16 VALUE "Comments", "compiler: "COMPILER_NAME"\0"
17 VALUE "FileVersion", MANIFEST_UUID"("COMPILER_NAME"\0"
18
19 (c) "MANIFES
20
21 Version", MANIFEST_VERSION" "MANIFEST_DATE" UTC\0"
22 END
23 END
24 BLOCK "VarFileInfo"
25 BEGIN
26
27 END
28 END
29
--- a/win/fossil.rc
+++ b/win/fossil.rc
@@ -1,29 +1,23 @@
1 /*
2 ** Copyright (c) /* !defined(VS_FF_NONE) */
3
4 #include "VERSION.h"
5 #define _RC_COMPILE_
6 #include def FOSSIL_ENABLE_SSL merchanta
7
8 #ifdef FOSSIL_ENABLE_TCLou can redistribute it a
9
10 #ifdef nse".)
11
12 ** This prhe Simplified BSD License (also
13 or "FreeBSD Ldef _WIN32ar ptable on Windo_WIN32PRIVATE************************if !defined(VS_FF_NONE)
14 # define VS_FF_NONE 0x00000000L
15 #endif /* !defined(VS_FF_NONE) */
16
17 #include "VERSION.h"
18 #define _RC_Com
19 ** http://wwtable on Windows*******************0x3F***
20 **
21 ** This prd BSD License (also
22 or "FreeBSD define VS_FF_NONE 1,0,0,0
23 PRODUCTVERSION 1,0,0,0ZlibEnabled", "Yes, !defined(NDEBUG) &&f
 
 
 
 
 
 

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button