Fossil SCM

Add support for Windows 8.1. For details, see [http://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx]. This switches off all Windows compatibility modes, trying to make Windows 8.1 look like an earlier Windows OS.

jan.nijtmans 2013-11-22 09:45 trunk
Commit 3788d7939814d9b892f039baf758e9a1ba1e0a87
Parent 0deb022ae57d2bd…
5 files changed +2 +2 +2 +39 +12
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin + win/fossil.exe.manifest ~ win/fossil.rc
M src/makemake.tcl
+2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -648,13 +648,15 @@
648648
649649
 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
650650
 ifdef USE_WINDOWS
651651
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
652652
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
653
+ $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
653654
 else
654655
 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
655656
 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
657
+ $(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
656658
 endif
657659
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
658660
659661
 install: $(OBJDIR) $(APPNAME)
660662
 ifdef USE_WINDOWS
661663
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -648,13 +648,15 @@
648
649 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
650 ifdef USE_WINDOWS
651 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
652 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
 
653 else
654 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
655 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
 
656 endif
657 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
658
659 install: $(OBJDIR) $(APPNAME)
660 ifdef USE_WINDOWS
661
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -648,13 +648,15 @@
648
649 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
650 ifdef USE_WINDOWS
651 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
652 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
653 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
654 else
655 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
656 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
657 $(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
658 endif
659 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
660
661 install: $(OBJDIR) $(APPNAME)
662 ifdef USE_WINDOWS
663
M win/Makefile.mingw
+2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -618,13 +618,15 @@
618618
619619
 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
620620
 ifdef USE_WINDOWS
621621
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
622622
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
623
+ $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
623624
 else
624625
 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
625626
 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
627
+ $(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
626628
 endif
627629
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
628630
629631
 install: $(OBJDIR) $(APPNAME)
630632
 ifdef USE_WINDOWS
631633
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -618,13 +618,15 @@
618
619 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
620 ifdef USE_WINDOWS
621 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
622 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
 
623 else
624 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
625 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
 
626 endif
627 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
628
629 install: $(OBJDIR) $(APPNAME)
630 ifdef USE_WINDOWS
631
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -618,13 +618,15 @@
618
619 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
620 ifdef USE_WINDOWS
621 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
622 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
623 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
624 else
625 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
626 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
627 $(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
628 endif
629 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
630
631 install: $(OBJDIR) $(APPNAME)
632 ifdef USE_WINDOWS
633
M win/Makefile.mingw.mistachkin
+2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -618,13 +618,15 @@
618618
619619
 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
620620
 ifdef USE_WINDOWS
621621
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
622622
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
623
+ $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
623624
 else
624625
 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
625626
 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
627
+ $(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
626628
 endif
627629
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
628630
629631
 install: $(OBJDIR) $(APPNAME)
630632
 ifdef USE_WINDOWS
631633
632634
ADDED win/fossil.exe.manifest
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -618,13 +618,15 @@
618
619 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
620 ifdef USE_WINDOWS
621 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
622 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
 
623 else
624 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
625 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
 
626 endif
627 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
628
629 install: $(OBJDIR) $(APPNAME)
630 ifdef USE_WINDOWS
631
632 DDED win/fossil.exe.manifest
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -618,13 +618,15 @@
618
619 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
620 ifdef USE_WINDOWS
621 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
622 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
623 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
624 else
625 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
626 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
627 $(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
628 endif
629 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
630
631 install: $(OBJDIR) $(APPNAME)
632 ifdef USE_WINDOWS
633
634 DDED win/fossil.exe.manifest
A win/fossil.exe.manifest
+39
--- a/win/fossil.exe.manifest
+++ b/win/fossil.exe.manifest
@@ -0,0 +1,39 @@
1
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"
3
+ xmlns:asmv3="urn:schema <assemblyIdentity
4
+ version="1.28.0.0"
5
+ 0" processorArchitecture="*"
6
+ name="fossil"
7
+ type="wSimple, high-reliability, distributed software configuration management system</description>
8
+ version="1.0" encoding="UTF-<?xml version:asm.v3">
9
+ <security>
10
+ <requestedExecutionLevel
11
+ level="asInvoker"
12
+ </requestedPrivileges>
13
+ </security>
14
+ </trustInfo>
15
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
16
+ <application>
17
+ <!-- Windows 8.1 -->
18
+ 457-1546-43c5-a5fe-0080f6d0da78}"/>
19
+ <!-- Windows 8 -->
20
+ 457-1546-43c5-a5fe-0084a2f28e3-53b9- <!-- Windows 7 -->
21
+ 457-1546-43c5-a5fe-00840225f93a}"/>
22
+ <!-- Windows Vista -->
23
+ ility>
24
+ <asmv3:a </compatibility>
25
+ <asmv3:application>
26
+ xmlns="http://sc <dpiAware>true</dpiAware>
27
+ </ xmlns="http://s>
28
+ </asmv3:application>
29
+ <dependency>
30
+ < <assemblyIdentity
31
+ type="win32"
32
+ mmon-Controls"
33
+ *
34
+ 0" processorArchitecture="*"
35
+ 144ccf1df"
36
+ language="*"
37
+ />
38
+ </dependency>
39
+</assembly>
--- a/win/fossil.exe.manifest
+++ b/win/fossil.exe.manifest
@@ -0,0 +1,39 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
--- a/win/fossil.exe.manifest
+++ b/win/fossil.exe.manifest
@@ -0,0 +1,39 @@
1 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"
3 xmlns:asmv3="urn:schema <assemblyIdentity
4 version="1.28.0.0"
5 0" processorArchitecture="*"
6 name="fossil"
7 type="wSimple, high-reliability, distributed software configuration management system</description>
8 version="1.0" encoding="UTF-<?xml version:asm.v3">
9 <security>
10 <requestedExecutionLevel
11 level="asInvoker"
12 </requestedPrivileges>
13 </security>
14 </trustInfo>
15 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
16 <application>
17 <!-- Windows 8.1 -->
18 457-1546-43c5-a5fe-0080f6d0da78}"/>
19 <!-- Windows 8 -->
20 457-1546-43c5-a5fe-0084a2f28e3-53b9- <!-- Windows 7 -->
21 457-1546-43c5-a5fe-00840225f93a}"/>
22 <!-- Windows Vista -->
23 ility>
24 <asmv3:a </compatibility>
25 <asmv3:application>
26 xmlns="http://sc <dpiAware>true</dpiAware>
27 </ xmlns="http://s>
28 </asmv3:application>
29 <dependency>
30 < <assemblyIdentity
31 type="win32"
32 mmon-Controls"
33 *
34 0" processorArchitecture="*"
35 144ccf1df"
36 language="*"
37 />
38 </dependency>
39 </assembly>
M win/fossil.rc
+12
--- win/fossil.rc
+++ win/fossil.rc
@@ -130,5 +130,17 @@
130130
 BLOCK "VarFileInfo"
131131
 BEGIN
132132
 VALUE "Translation", 0x409, 0x4b0
133133
 END
134134
 END
135
+
136
+//
137
+// This is needed for Windows 8.1 onwards.
138
+//
139
+
140
+#ifndef RT_MANIFEST
141
+#define RT_MANIFEST 24
142
+#endif
143
+#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
144
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
145
+#endif
146
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "fossil.exe.manifest"
135147
--- win/fossil.rc
+++ win/fossil.rc
@@ -130,5 +130,17 @@
130 BLOCK "VarFileInfo"
131 BEGIN
132 VALUE "Translation", 0x409, 0x4b0
133 END
134 END
 
 
 
 
 
 
 
 
 
 
 
 
135
--- win/fossil.rc
+++ win/fossil.rc
@@ -130,5 +130,17 @@
130 BLOCK "VarFileInfo"
131 BEGIN
132 VALUE "Translation", 0x409, 0x4b0
133 END
134 END
135
136 //
137 // This is needed for Windows 8.1 onwards.
138 //
139
140 #ifndef RT_MANIFEST
141 #define RT_MANIFEST 24
142 #endif
143 #ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
144 #define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
145 #endif
146 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "fossil.exe.manifest"
147

Keyboard Shortcuts

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