Tag Dolphin 3.03.0

git-svn-id: https://dolphin-emu.googlecode.com/svn/tags/3.0@7615 8ced0084-cf51-0410-be5f-012b33b47a6e

3.0: Removed SVNRevGen stuff; changed revision string to 3.0; Removed installer since it was vastly outdated; Bumped CMake major version to 3

git-svn-id: https://dolphin-emu.googlecode.com/svn/tags/3.0@7616 8ced0084-cf51-0410-be5f-012b33b47a6e

3.0: Add the languages which were chosen to be release-worthy.
Uhm, unless I forgot something important, I guess we can declare 3.0 as officially released now and stuff. Cheers ;)

git-svn-id: https://dolphin-emu.googlecode.com/svn/tags/3.0@7617 8ced0084-cf51-0410-be5f-012b33b47a6e

3.0: Fix SCons build

git-svn-id: https://dolphin-emu.googlecode.com/svn/tags/3.0@7627 8ced0084-cf51-0410-be5f-012b33b47a6e

9 files changed, 5 insertions, 188 deletions

diff --git a/Source/Core/Common/SConscript b/Source/Core/Common/SConscript
index 74eebdd611..0706fb9439 100644
--- a/Source/Core/Common/SConscript
+++ b/Source/Core/Common/SConscript
@@ -4,17 +4,6 @@ Import('env')
 import os
 import sys
 
-def createVersion(env, target, source):
-        tmpstr = open(source[0].path, 'r').read().\
-		replace("$WCMODS?$WCREV$M:$WCREV$$", env['svnrev'])
-        outfile = open(target[0].path, 'w')
-        outfile.write(tmpstr + '\n')
-        outfile.close()
-
-Execute(Delete('Src/svnrev.h'))
-env.Command('Src/svnrev.h', 'Src/svnrev_template.h',
-	[Delete('${TARGET.srcpath}'), createVersion])
-
 files = [
 	'Src/ABI.cpp',
 	'Src/BreakPoints.cpp',
diff --git a/Source/Core/Common/SVNRevGen.vcxproj b/Source/Core/Common/SVNRevGen.vcxproj
deleted file mode 100644
index 45d6d10368..0000000000
--- a/Source/Core/Common/SVNRevGen.vcxproj
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="make_svnrev.h.js">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cscript /nologo /E:JScript "make_svnrev.h.js"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Updating svnrev.h</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">dummy</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\svnrev.h" />
-    <ClInclude Include="Src\svnrev_template.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid>
-    <RootNamespace>SVNRevGen</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <CustomBuild>
-      <Outputs>
-      </Outputs>
-    </CustomBuild>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/Core/Common/Src/Version.cpp b/Source/Core/Common/Src/Version.cpp
index 4f2f0b1d77..83531e2bc8 100644
--- a/Source/Core/Common/Src/Version.cpp
+++ b/Source/Core/Common/Src/Version.cpp
@@ -19,11 +19,11 @@
 #include "svnrev.h"
 
 #ifdef _DEBUG
-const char *svn_rev_str = "Dolphin Debug r" SVN_REV_STR;
+const char *svn_rev_str = "Dolphin Debug " SVN_REV_STR;
 #elif defined DEBUGFAST
-const char *svn_rev_str = "Dolphin Debugfast r" SVN_REV_STR;
+const char *svn_rev_str = "Dolphin Debugfast " SVN_REV_STR;
 #else
-const char *svn_rev_str = "Dolphin r" SVN_REV_STR;
+const char *svn_rev_str = "Dolphin " SVN_REV_STR;
 #endif   
 
 #ifdef _M_X64
diff --git a/Source/Core/Common/Src/svnrev.h b/Source/Core/Common/Src/svnrev.h
new file mode 100644
index 0000000000..fa15eb308c
--- /dev/null
+++ b/Source/Core/Common/Src/svnrev.h
@@ -0,0 +1 @@
+#define SVN_REV_STR "3.0"

diff --git a/Source/Core/Common/Src/svnrev_template.h b/Source/Core/Common/Src/svnrev_template.h
deleted file mode 100644
index 0d3e482e1b..0000000000
--- a/Source/Core/Common/Src/svnrev_template.h
+++ /dev/null
@@ -1 +0,0 @@
-#define SVN_REV_STR "$WCMODS?$WCREV$M:$WCREV$$"
diff --git a/Source/Core/Common/SubWCRev.exe b/Source/Core/Common/SubWCRev.exe
deleted file mode 100644
index 32a252b58b..0000000000
--- a/Source/Core/Common/SubWCRev.exe
+++ /dev/null
diff --git a/Source/Core/Common/make_svnrev.h.js b/Source/Core/Common/make_svnrev.h.js
deleted file mode 100644
index 38bcda312a..0000000000
--- a/Source/Core/Common/make_svnrev.h.js
+++ /dev/null
@@ -1,79 +0,0 @@
-var wshShell	= new ActiveXObject("WScript.Shell")
-var oFS			= new ActiveXObject("Scripting.FileSystemObject");
-
-var outfile		= "./Src/svnrev.h";
-var svncmd		= "SubWCRev ../../.. ./Src/svnrev_template.h " + outfile;
-var svntestcmd	= "SubWCRev ../../..";
-var hgcmd		= "hg svn info";
-
-var SVN = 1, HG = 2;
-var file_rev = 0, cur_rev = 0, cur_cms = 0;
-
-function RunCmdGetMatch(cmd, regex)
-{
-	// run the command
-	try
-	{
-		var cmdexec	= wshShell.Exec(cmd);
-	}
-	catch (e)
-	{
-		// catch "the system cannot find the file specified" error
-		return 0;
-	}
-	// ReadLine is synchronous
-	while (!cmdexec.StdOut.AtEndOfStream)
-	{
-		var reg_exec = regex.exec(cmdexec.StdOut.ReadLine())
-		if (reg_exec)
-			return reg_exec[1];	// return first capture group
-	}
-	// failed
-	return 0;
-}
-
-if (oFS.FileExists(outfile))
-{
-	// file exists, read the value of SVN_REV_STR
-	file_rev	= oFS.OpenTextFile(outfile).ReadLine().match(/\d+/);
-}
-else
-{
-	// file doesn't exist, create it
-	oFS.CreateTextFile(outfile);
-}
-
-// get the "Last commited at revision" from SubWCRev's output
-cur_rev = RunCmdGetMatch(svntestcmd, /^Last .*?(\d+)/);
-if (cur_rev)
-	cur_cms = SVN;
-else
-{
-	// SubWCRev failed, so use hg
-	cur_rev = RunCmdGetMatch(hgcmd, /Revision.*?(\d+)/);
-	if (cur_rev)
-		cur_cms = HG;
-	else
-	{
-		WScript.Echo("Neither SVN or Hg revision info found!");
-		WScript.Quit(1);
-	}
-}
-
-// check if svnrev.h needs updating
-if (cur_rev == file_rev)
-{
-	WScript.Echo("svnrev.h doesn't need updating (already at " + cur_rev + ")");
-	WScript.Quit(0);
-}
-else if (cur_cms == SVN)
-{
-	// update using SubWCRev and template file
-	var ret = wshShell.run(svncmd, 0, true);
-}
-else
-{
-	// manually create the file
-	oFS.CreateTextFile(outfile, true).WriteLine("#define SVN_REV_STR \"" + cur_rev + "\"");
-}
-WScript.Echo("svnrev.h updated (" + cur_rev + ")");
\ No newline at end of file
diff --git a/Source/Core/DolphinWX/SConscript b/Source/Core/DolphinWX/SConscript
index a5a62bb558..143255503d 100644
--- a/Source/Core/DolphinWX/SConscript
+++ b/Source/Core/DolphinWX/SConscript
@@ -113,7 +113,7 @@ elif sys.platform == 'darwin':
 		CFBundleIdentifier = 'com.dolphin-emulator.dolphin',
 		CFBundleLocalizations = languages,
 		CFBundlePackageType = 'APPL',
-		CFBundleShortVersionString = env['svnrev'],
+		CFBundleShortVersionString = '0',
 		CFBundleVersion = '3.0',
 		LSMinimumSystemVersion = '10.5.4',
 		LSRequiresCarbon = True,
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index 19554b4de3..c11dcf7e59 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -49,27 +49,12 @@ static const wxLanguage langIds[] =
 {
 	wxLANGUAGE_DEFAULT,
 	wxLANGUAGE_ARABIC,
-	wxLANGUAGE_CATALAN,
-	wxLANGUAGE_CHINESE_SIMPLIFIED,
-	wxLANGUAGE_CHINESE_TRADITIONAL,
-	wxLANGUAGE_CZECH,
-	wxLANGUAGE_DANISH,
-	wxLANGUAGE_DUTCH,
 	wxLANGUAGE_ENGLISH,
 	wxLANGUAGE_FRENCH,
-	wxLANGUAGE_GERMAN,
 	wxLANGUAGE_GREEK,
-	wxLANGUAGE_HEBREW,
 	wxLANGUAGE_HUNGARIAN,
-	wxLANGUAGE_ITALIAN,
-	wxLANGUAGE_JAPANESE,
-	wxLANGUAGE_KOREAN,
-	wxLANGUAGE_NORWEGIAN_BOKMAL,
-	wxLANGUAGE_POLISH,
 	wxLANGUAGE_PORTUGUESE,
 	wxLANGUAGE_PORTUGUESE_BRAZILIAN,
-	wxLANGUAGE_RUSSIAN,
-	wxLANGUAGE_SERBIAN,
 	wxLANGUAGE_SPANISH,
 	wxLANGUAGE_TURKISH,
 };
@@ -288,27 +273,12 @@ void CConfigMain::InitializeGUILists()
 	// keep these in sync with the langIds array at the beginning of this file
 	arrayStringFor_InterfaceLang.Add(_("<System>"));
 	arrayStringFor_InterfaceLang.Add(_("Arabic"));
-	arrayStringFor_InterfaceLang.Add(_("Catalan"));
-	arrayStringFor_InterfaceLang.Add(_("Chinese (Simplified)"));
-	arrayStringFor_InterfaceLang.Add(_("Chinese (Traditional)"));
-	arrayStringFor_InterfaceLang.Add(_("Czech"));
-	arrayStringFor_InterfaceLang.Add(_("Danish"));
-	arrayStringFor_InterfaceLang.Add(_("Dutch"));
 	arrayStringFor_InterfaceLang.Add(_("English"));
 	arrayStringFor_InterfaceLang.Add(_("French"));
-	arrayStringFor_InterfaceLang.Add(_("German"));
 	arrayStringFor_InterfaceLang.Add(_("Greek"));
-	arrayStringFor_InterfaceLang.Add(_("Hebrew"));
 	arrayStringFor_InterfaceLang.Add(_("Hungarian"));
-	arrayStringFor_InterfaceLang.Add(_("Italian"));
-	arrayStringFor_InterfaceLang.Add(_("Japanese"));
-	arrayStringFor_InterfaceLang.Add(_("Korean"));
-	arrayStringFor_InterfaceLang.Add(_("Norwegian Bokmaal"));
-	arrayStringFor_InterfaceLang.Add(_("Polish"));
 	arrayStringFor_InterfaceLang.Add(_("Portuguese"));
 	arrayStringFor_InterfaceLang.Add(_("Portuguese (Brazilian)"));
-	arrayStringFor_InterfaceLang.Add(_("Russian"));
-	arrayStringFor_InterfaceLang.Add(_("Serbian"));
 	arrayStringFor_InterfaceLang.Add(_("Spanish"));
 	arrayStringFor_InterfaceLang.Add(_("Turkish"));
 }