Commit 79b3fc03 authored by callum_linden's avatar callum_linden

Pull in version 74.1.19_gb62bacf_chromium-74.0.3729.157 of CEF to match updates in source

parent 7fc7f6ac
......@@ -20,9 +20,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>9201b6d7d353b53e00bbe2890ab1bcaf</string>
<string>9d2a7bd26bb36b0442f93ec707714932</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33596/278387/cef_bin-3.3626.1895.g7001d56.525100-darwin64-525100.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38787/327397/cef_bin-74.1.19_gb62bacf_chromium-74.0.3729.157.527983-darwin64-527983.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
......@@ -32,9 +32,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ac07c0db9b1dc9cba704f9d8115afff5</string>
<string>da83fd7701204ad3a58e6d327c01cf09</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33597/278395/cef_bin-3.3626.1895.g7001d56.525100-windows-525100.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38788/327403/cef_bin-74.1.19_gb62bacf_chromium-74.0.3729.157.527983-windows-527983.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
......@@ -44,16 +44,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>961e7774a0c19f9de11f2eba14fbeb60</string>
<string>7e02988c0c27c447fe2f264cfb426d1f</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33598/278394/cef_bin-3.3626.1895.g7001d56.525100-windows64-525100.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38789/327408/cef_bin-74.1.19_gb62bacf_chromium-74.0.3729.157.527983-windows64-527983.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>3.3626.1895.g7001d56.525100</string>
<string>74.1.19_gb62bacf_chromium-74.0.3729.157.527983</string>
</map>
</map>
<key>package_description</key>
......
......@@ -19,13 +19,26 @@
int main(int argc, char *argv[])
{
std::string cef_version = std::string(CEF_VERSION);
// CEF packages now contain a '+' sign e.g. "74.1.19+gb62bacf+chromium-74.0.3729.157"
// which causes all kinds of issues with our build tools when the version is baked
// into a URL so let's convert the '+'s to something else
const std::string str_plus("+");
const std::string str_plus_replace("_");
while(cef_version.find(str_plus) != std::string::npos)
{
cef_version.replace(cef_version.find(str_plus),str_plus.length(),str_plus_replace);
}
std::cout << DULLAHAN_VERSION_MAJOR;
std::cout << ".";
std::cout << DULLAHAN_VERSION_MINOR;
std::cout << ".";
std::cout << DULLAHAN_VERSION_BUILD;
std::cout << "_";
std::cout << CEF_VERSION;
std::cout << cef_version;
std::cout << std::endl;
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment