mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 21:38:59 +08:00
186978b0e4
* Updated to point at 1.1.34 tagged version of libxslt, merged the patch differences and added the required, additional patches to get it building. * Added missing version info using "vcpkg x-add-version". * Update ports/libxslt/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Re-added the version with the port-version fix in. * Fix for x64-windows-static builds. * Another re-add of the version since the git tree hash is different. * [libxslt] Reorganize patches Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
diff --git a/win32/configure.js b/win32/configure.js
|
|
index 0737b06..11815e4 100644
|
|
--- a/win32/configure.js
|
|
+++ b/win32/configure.js
|
|
@@ -138,7 +138,7 @@ function usage()
|
|
file included by our makefile. */
|
|
function discoverVersion()
|
|
{
|
|
- var fso, cf, vf, ln, s;
|
|
+ var fso, cf, vf, ln, s, m;
|
|
fso = new ActiveXObject("Scripting.FileSystemObject");
|
|
verCvs = "";
|
|
if (useCvsVer && fso.FileExists("..\\CVS\\Entries")) {
|
|
@@ -147,8 +147,8 @@ function discoverVersion()
|
|
ln = cf.ReadLine();
|
|
s = new String(ln);
|
|
if (s.search(/^\/ChangeLog\//) != -1) {
|
|
- iDot = s.indexOf(".");
|
|
- iSlash = s.indexOf("/", iDot);
|
|
+ var iDot = s.indexOf(".");
|
|
+ var iSlash = s.indexOf("/", iDot);
|
|
verCvs = "CVS" + s.substring(iDot + 1, iSlash);
|
|
break;
|
|
}
|
|
@@ -178,13 +178,13 @@ function discoverVersion()
|
|
verMicroXslt = m[1];
|
|
} else if (s.search(/^LIBEXSLT_MAJOR_VERSION=/) != -1) {
|
|
vf.WriteLine(s);
|
|
- verMajorExslt = s.substring(s.indexOf("=") + 1, s.length)
|
|
+ verMajorExslt = s.substring(s.indexOf("=") + 1, s.length);
|
|
} else if(s.search(/^LIBEXSLT_MINOR_VERSION=/) != -1) {
|
|
vf.WriteLine(s);
|
|
- verMinorExslt = s.substring(s.indexOf("=") + 1, s.length)
|
|
+ verMinorExslt = s.substring(s.indexOf("=") + 1, s.length);
|
|
} else if(s.search(/^LIBEXSLT_MICRO_VERSION=/) != -1) {
|
|
vf.WriteLine(s);
|
|
- verMicroExslt = s.substring(s.indexOf("=") + 1, s.length)
|
|
+ verMicroExslt = s.substring(s.indexOf("=") + 1, s.length);
|
|
}
|
|
}
|
|
cf.Close();
|
|
@@ -365,8 +365,6 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
|
|
buildStatic = strToBool(arg.substring(opt.length + 1, arg.length));
|
|
else if (opt == "prefix")
|
|
buildPrefix = arg.substring(opt.length + 1, arg.length);
|
|
- else if (opt == "incdir")
|
|
- buildIncPrefix = arg.substring(opt.length + 1, arg.length);
|
|
else if (opt == "bindir")
|
|
buildBinPrefix = arg.substring(opt.length + 1, arg.length);
|
|
else if (opt == "libdir")
|