Fossil SCM

Fix C++ style comment in RC file. Reformat the manifest file to be easier to read/maintain.

mistachkin 2013-11-22 21:24 trunk
Commit f103e0bc97d19ac84e77a2a698ce7f63992bb42e
Parent 3788d7939814d9b…
2 files changed +38 -48 +5 -3
~ win/fossil.exe.manifest ~ win/fossil.rc
M win/fossil.exe.manifest
+38 -48
--- win/fossil.exe.manifest
+++ win/fossil.exe.manifest
@@ -1,51 +1,41 @@
11
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"
3
- xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
4
- <assemblyIdentity
5
- version="1.28.0.0"
6
- processorArchitecture="X86"
7
- name="fossil"
8
- type="win32"
9
- />
10
- <description>Simple, high-reliability, distributed software configuration management system</description>
11
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
12
- <security>
13
- <requestedPrivileges>
14
- <requestedExecutionLevel
15
- level="asInvoker"
16
- uiAccess="false"
17
- />
18
- </requestedPrivileges>
19
- </security>
20
- </trustInfo>
21
- <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
22
- <application>
23
- <!-- Windows 8.1 -->
24
- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
25
- <!-- Windows 8 -->
26
- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
27
- <!-- Windows 7 -->
28
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
29
- <!-- Windows Vista -->
30
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
31
- </application>
32
- </compatibility>
33
- <asmv3:application>
34
- <asmv3:windowsSettings
35
- xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
36
- <dpiAware>true</dpiAware>
37
- </asmv3:windowsSettings>
38
- </asmv3:application>
39
- <dependency>
40
- <dependentAssembly>
41
- <assemblyIdentity
42
- type="win32"
43
- name="Microsoft.Windows.Common-Controls"
44
- version="6.0.0.0"
45
- processorArchitecture="X86"
46
- publicKeyToken="6595b64144ccf1df"
47
- language="*"
48
- />
49
- </dependentAssembly>
50
- </dependency>
3
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
4
+ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="fossil"
5
+ type="win32" />
6
+ <description>
7
+ Simple, high-reliability, distributed software configuration management system.
8
+ </description>
9
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
10
+ <security>
11
+ <requestedPrivileges>
12
+ <requestedExecutionLevel level="asInvoker" uiAccess="false" />
13
+ </requestedPrivileges>
14
+ </security>
15
+ </trustInfo>
16
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
17
+ <application>
18
+ <!-- Windows 8.1 -->
19
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
20
+ <!-- Windows 8 -->
21
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
22
+ <!-- Windows 7 -->
23
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
24
+ <!-- Windows Vista -->
25
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
26
+ </application>
27
+ </compatibility>
28
+ <asmv3:application>
29
+ <asmv3:windowsSettings
30
+ xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
31
+ <dpiAware>true</dpiAware>
32
+ </asmv3:windowsSettings>
33
+ </asmv3:application>
34
+ <dependency>
35
+ <dependentAssembly>
36
+ <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls"
37
+ version="6.0.0.0" processorArchitecture="X86"
38
+ publicKeyToken="6595b64144ccf1df" language="*" />
39
+ </dependentAssembly>
40
+ </dependency>
5141
 </assembly>
5242
--- win/fossil.exe.manifest
+++ win/fossil.exe.manifest
@@ -1,51 +1,41 @@
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:schemas-microsoft-com:asm.v3">
4 <assemblyIdentity
5 version="1.28.0.0"
6 processorArchitecture="X86"
7 name="fossil"
8 type="win32"
9 />
10 <description>Simple, high-reliability, distributed software configuration management system</description>
11 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
12 <security>
13 <requestedPrivileges>
14 <requestedExecutionLevel
15 level="asInvoker"
16 uiAccess="false"
17 />
18 </requestedPrivileges>
19 </security>
20 </trustInfo>
21 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
22 <application>
23 <!-- Windows 8.1 -->
24 <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
25 <!-- Windows 8 -->
26 <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
27 <!-- Windows 7 -->
28 <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
29 <!-- Windows Vista -->
30 <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
31 </application>
32 </compatibility>
33 <asmv3:application>
34 <asmv3:windowsSettings
35 xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
36 <dpiAware>true</dpiAware>
37 </asmv3:windowsSettings>
38 </asmv3:application>
39 <dependency>
40 <dependentAssembly>
41 <assemblyIdentity
42 type="win32"
43 name="Microsoft.Windows.Common-Controls"
44 version="6.0.0.0"
45 processorArchitecture="X86"
46 publicKeyToken="6595b64144ccf1df"
47 language="*"
48 />
49 </dependentAssembly>
50 </dependency>
51 </assembly>
52
--- win/fossil.exe.manifest
+++ win/fossil.exe.manifest
@@ -1,51 +1,41 @@
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:schemas-microsoft-com:asm.v3">
4 <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="fossil"
5 type="win32" />
6 <description>
7 Simple, high-reliability, distributed software configuration management system.
8 </description>
9 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
10 <security>
11 <requestedPrivileges>
12 <requestedExecutionLevel level="asInvoker" uiAccess="false" />
13 </requestedPrivileges>
14 </security>
15 </trustInfo>
16 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
17 <application>
18 <!-- Windows 8.1 -->
19 <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
20 <!-- Windows 8 -->
21 <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
22 <!-- Windows 7 -->
23 <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
24 <!-- Windows Vista -->
25 <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
26 </application>
27 </compatibility>
28 <asmv3:application>
29 <asmv3:windowsSettings
30 xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
31 <dpiAware>true</dpiAware>
32 </asmv3:windowsSettings>
33 </asmv3:application>
34 <dependency>
35 <dependentAssembly>
36 <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls"
37 version="6.0.0.0" processorArchitecture="X86"
38 publicKeyToken="6595b64144ccf1df" language="*" />
39 </dependentAssembly>
40 </dependency>
 
 
 
 
 
 
 
 
 
 
41 </assembly>
42
M win/fossil.rc
+5 -3
--- win/fossil.rc
+++ win/fossil.rc
@@ -131,16 +131,18 @@
131131
 BEGIN
132132
 VALUE "Translation", 0x409, 0x4b0
133133
 END
134134
 END
135135
136
-//
137
-// This is needed for Windows 8.1 onwards.
138
-//
136
+/*
137
+ * This embedded manifest is needed for Windows 8.1.
138
+ */
139139
140140
 #ifndef RT_MANIFEST
141141
 #define RT_MANIFEST 24
142142
 #endif
143
+
143144
 #ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
144145
 #define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
145146
 #endif
147
+
146148
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "fossil.exe.manifest"
147149
--- win/fossil.rc
+++ win/fossil.rc
@@ -131,16 +131,18 @@
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
--- win/fossil.rc
+++ win/fossil.rc
@@ -131,16 +131,18 @@
131 BEGIN
132 VALUE "Translation", 0x409, 0x4b0
133 END
134 END
135
136 /*
137 * This embedded manifest is needed for Windows 8.1.
138 */
139
140 #ifndef RT_MANIFEST
141 #define RT_MANIFEST 24
142 #endif
143
144 #ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
145 #define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
146 #endif
147
148 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "fossil.exe.manifest"
149

Keyboard Shortcuts

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