Skip to content

Commit

Permalink
branch fix after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
marcin1980 committed Jul 25, 2016
1 parent 7f4f8ac commit 883d971
Show file tree
Hide file tree
Showing 600 changed files with 115,342 additions and 7,567 deletions.
13 changes: 11 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ string(STRIP ${WB_VERSION} WB_VERSION)
# Look for our custom modules in cmake/Modules:
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/cmake/Modules/")

if(ENABLE_COTIRE)
if(ENABLE_COTIRE AND CMAKE_VERSION VERSION_GREATER "2.8.11")
include(cotire)
set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY")
endif()
Expand All @@ -66,9 +66,18 @@ if (USE_BUNDLED_MYSQLDUMP)
set(USE_BUNDLED_MYSQLDUMP -DHAVE_BUNDLED_MYSQLDUMP=1)
endif ()


find_package(Threads)
find_package(SWIG REQUIRED)
include(${SWIG_USE_FILE})
include(ssl)

IF (WITH_SSL)
MYSQL_CHECK_SSL()
MESSAGE(STATUS "SSL_LIBRARIES: ${SSL_LIBRARIES}")
MESSAGE(STATUS "SSL_DEFINES: ${SSL_DEFINES}")
MESSAGE(STATUS "SSL_INCLUDE_DIRS: ${SSL_INCLUDE_DIRS}")
ENDIF()


# All known publicly available versions of Antlr3C are buggy

Expand Down
62 changes: 0 additions & 62 deletions MySQLWorkbench.sln
Original file line number Diff line number Diff line change
Expand Up @@ -551,16 +551,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "linux", "linux", "{FADA09F1
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilities.grt", "modules\utilities\utilities.grt.vcxproj", "{B94B7613-CBA5-4B30-834D-E16F414D1B1C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "11 - MySQLWorkbench.X", "11 - MySQLWorkbench.X", "{AAF3C627-781D-449B-BFDD-3863A20E4BC5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySQLWorkbench.X", "MySQLWorkbench.X\win\workbench\MySQLWorkbench.X.csproj", "{09F90191-FE11-4C84-9336-16153CE8A370}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlworkbench.x.wr", "MySQLWorkbench.X\win\mysqlworkbench.x.wr\mysqlworkbench.x.wr.vcxproj", "{46C043BE-3C98-4BCE-AECA-8D31F9035062}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ide", "ide", "{610F6D5E-D80D-49B6-9F8C-DB2308901B0D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wb.x.ide", "MySQLWorkbench.X\ide\wb.x.ide\wb.x.ide.vcxproj", "{70E71FFB-AB26-498A-B756-9EE4315E5D9B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Expand Down Expand Up @@ -1401,54 +1391,6 @@ Global
{B94B7613-CBA5-4B30-834D-E16F414D1B1C}.Release|x64.Build.0 = Release|x64
{B94B7613-CBA5-4B30-834D-E16F414D1B1C}.Release|x86.ActiveCfg = Release|Win32
{B94B7613-CBA5-4B30-834D-E16F414D1B1C}.Release|x86.Build.0 = Release|Win32
{09F90191-FE11-4C84-9336-16153CE8A370}.Debug|x64.ActiveCfg = Debug|x64
{09F90191-FE11-4C84-9336-16153CE8A370}.Debug|x64.Build.0 = Debug|x64
{09F90191-FE11-4C84-9336-16153CE8A370}.Debug|x86.ActiveCfg = Debug|x86
{09F90191-FE11-4C84-9336-16153CE8A370}.Debug|x86.Build.0 = Debug|x86
{09F90191-FE11-4C84-9336-16153CE8A370}.Release_OSS|x64.ActiveCfg = Release|x64
{09F90191-FE11-4C84-9336-16153CE8A370}.Release_OSS|x64.Build.0 = Release|x64
{09F90191-FE11-4C84-9336-16153CE8A370}.Release_OSS|x86.ActiveCfg = Release|x86
{09F90191-FE11-4C84-9336-16153CE8A370}.Release_OSS|x86.Build.0 = Release|x86
{09F90191-FE11-4C84-9336-16153CE8A370}.Release_Testing|x64.ActiveCfg = Release|x64
{09F90191-FE11-4C84-9336-16153CE8A370}.Release_Testing|x64.Build.0 = Release|x64
{09F90191-FE11-4C84-9336-16153CE8A370}.Release_Testing|x86.ActiveCfg = Release|x86
{09F90191-FE11-4C84-9336-16153CE8A370}.Release_Testing|x86.Build.0 = Release|x86
{09F90191-FE11-4C84-9336-16153CE8A370}.Release|x64.ActiveCfg = Release|x64
{09F90191-FE11-4C84-9336-16153CE8A370}.Release|x64.Build.0 = Release|x64
{09F90191-FE11-4C84-9336-16153CE8A370}.Release|x86.ActiveCfg = Release|x86
{09F90191-FE11-4C84-9336-16153CE8A370}.Release|x86.Build.0 = Release|x86
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Debug|x64.ActiveCfg = Debug|x64
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Debug|x64.Build.0 = Debug|x64
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Debug|x86.ActiveCfg = Debug|Win32
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Debug|x86.Build.0 = Debug|Win32
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Release_OSS|x64.ActiveCfg = Release_OSS|x64
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Release_OSS|x64.Build.0 = Release_OSS|x64
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Release_OSS|x86.ActiveCfg = Release_OSS|Win32
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Release_OSS|x86.Build.0 = Release_OSS|Win32
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Release_Testing|x64.ActiveCfg = Release|x64
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Release_Testing|x64.Build.0 = Release|x64
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Release_Testing|x86.ActiveCfg = Release|Win32
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Release_Testing|x86.Build.0 = Release|Win32
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Release|x64.ActiveCfg = Release|x64
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Release|x64.Build.0 = Release|x64
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Release|x86.ActiveCfg = Release|Win32
{46C043BE-3C98-4BCE-AECA-8D31F9035062}.Release|x86.Build.0 = Release|Win32
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Debug|x64.ActiveCfg = Debug|x64
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Debug|x64.Build.0 = Debug|x64
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Debug|x86.ActiveCfg = Debug|Win32
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Debug|x86.Build.0 = Debug|Win32
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Release_OSS|x64.ActiveCfg = Release_OSS|x64
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Release_OSS|x64.Build.0 = Release_OSS|x64
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Release_OSS|x86.ActiveCfg = Release_OSS|Win32
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Release_OSS|x86.Build.0 = Release_OSS|Win32
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Release_Testing|x64.ActiveCfg = Release|x64
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Release_Testing|x64.Build.0 = Release|x64
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Release_Testing|x86.ActiveCfg = Release|Win32
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Release_Testing|x86.Build.0 = Release|Win32
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Release|x64.ActiveCfg = Release|x64
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Release|x64.Build.0 = Release|x64
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Release|x86.ActiveCfg = Release|Win32
{70E71FFB-AB26-498A-B756-9EE4315E5D9B}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1544,9 +1486,5 @@ Global
{0F784E6B-0382-43A0-9251-28DE3FBA9550} = {1BBD1428-D18C-48EB-BA2E-01667E0A9A59}
{FADA09F1-53E8-4972-B77B-AEF3945D383A} = {1BBD1428-D18C-48EB-BA2E-01667E0A9A59}
{B94B7613-CBA5-4B30-834D-E16F414D1B1C} = {72E9A6AB-79B2-461F-B45A-924CC08E9007}
{09F90191-FE11-4C84-9336-16153CE8A370} = {AAF3C627-781D-449B-BFDD-3863A20E4BC5}
{46C043BE-3C98-4BCE-AECA-8D31F9035062} = {AAF3C627-781D-449B-BFDD-3863A20E4BC5}
{610F6D5E-D80D-49B6-9F8C-DB2308901B0D} = {AAF3C627-781D-449B-BFDD-3863A20E4BC5}
{70E71FFB-AB26-498A-B756-9EE4315E5D9B} = {610F6D5E-D80D-49B6-9F8C-DB2308901B0D}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,6 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "NO">
<Testables>
<TestableReference
skipped = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "16E4CDC20F28A56E00C1E118"
BuildableName = "UnitTests.octest"
BlueprintName = "Application Unit Tests"
ReferencedContainer = "container:MySQLWorkbench.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
Expand Down Expand Up @@ -94,6 +84,10 @@
argument = "-help"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "--configdir=~/Library/Application\ Support/MySQL/WorkbenchNg"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "--log-level=debug2"
isEnabled = "YES">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@
ReferencedContainer = "container:MySQLWorkbench.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "--classic"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
<EnvironmentVariables>
<EnvironmentVariable
key = "CG_CONTEXT_SHOW_BACKTRACE"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2B825E210E0B662200BE52DF"
BuildableName = "mysql.canvas.dylib"
BuildableName = "libmysql.canvas.dylib"
BlueprintName = "mysql.canvas"
ReferencedContainer = "container:MySQLWorkbench.xcodeproj">
</BuildableReference>
Expand Down Expand Up @@ -46,7 +46,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2B825E210E0B662200BE52DF"
BuildableName = "mysql.canvas.dylib"
BuildableName = "libmysql.canvas.dylib"
BlueprintName = "mysql.canvas"
ReferencedContainer = "container:MySQLWorkbench.xcodeproj">
</BuildableReference>
Expand All @@ -64,7 +64,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2B825E210E0B662200BE52DF"
BuildableName = "mysql.canvas.dylib"
BuildableName = "libmysql.canvas.dylib"
BlueprintName = "mysql.canvas"
ReferencedContainer = "container:MySQLWorkbench.xcodeproj">
</BuildableReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -15,8 +15,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "27467EBC154A96CB00021708"
BuildableName = "mysql.parser.dylib"
BlueprintName = "mysql.parser"
BuildableName = "libparsers.dylib"
BlueprintName = "parsers"
ReferencedContainer = "container:MySQLWorkbench.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -46,8 +46,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "27467EBC154A96CB00021708"
BuildableName = "mysql.parser.dylib"
BlueprintName = "mysql.parser"
BuildableName = "libparsers.dylib"
BlueprintName = "parsers"
ReferencedContainer = "container:MySQLWorkbench.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -64,8 +64,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "27467EBC154A96CB00021708"
BuildableName = "mysql.parser.dylib"
BlueprintName = "mysql.parser"
BuildableName = "libparsers.dylib"
BlueprintName = "parsers"
ReferencedContainer = "container:MySQLWorkbench.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Loading

0 comments on commit 883d971

Please sign in to comment.