Skip to content

Commit

Permalink
Fixed 64bit version #32
Browse files Browse the repository at this point in the history
  • Loading branch information
@salvadorbs
salvadorbs committed Feb 24, 2015
1 parent a2268ee commit 20faa52
Show file tree
Hide file tree
Showing 9 changed files with 105 additions and 31 deletions.
78 changes: 63 additions & 15 deletions ASuite.dproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>bin\ASuite.exe</DCC_DependencyCheckOutputName>
<ProjectVersion>16.0</ProjectVersion>
<Config Condition="'$(Config)'==''">Release</Config>
<Config Condition="'$(Config)'==''">Debug</Config>
<Base>True</Base>
<AppType>Application</AppType>
<FrameworkType>VCL</FrameworkType>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1</TargetedPlatforms>
<TargetedPlatforms>3</TargetedPlatforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
Expand All @@ -37,6 +37,12 @@
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
<Cfg_1_Win64>true</Cfg_1_Win64>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent>
Expand All @@ -48,13 +54,21 @@
<Cfg_2>true</Cfg_2>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
<Cfg_2_Win64>true</Cfg_2_Win64>
<CfgParent>Cfg_2</CfgParent>
<Cfg_2>true</Cfg_2>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
<DCC_ExeOutput>bin</DCC_ExeOutput>
<DCC_DcuOutput>dcu</DCC_DcuOutput>
<DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
<DCC_UNIT_PLATFORM>false</DCC_UNIT_PLATFORM>
<SanitizedProjectName>ASuite</SanitizedProjectName>
<VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
<Icon_MainIcon>ASuite_Icon.ico</Icon_MainIcon>
<VerInfo_Locale>1040</VerInfo_Locale>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_MajorVer>2</VerInfo_MajorVer>
Expand All @@ -65,15 +79,19 @@
<DCC_DependencyCheckOutputName>ASuite.exe</DCC_DependencyCheckOutputName>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<DCC_DcuOutput>dcu</DCC_DcuOutput>
<DCC_UnitSearchPath>3p;3p\Virtual Treeview\Source;3p\mormot\SynDBDataset;3p\mormot;3p\mormot\sqlite3;3p\dklang;3p\cyComponents6\Core;3p\cyComponents6\VCLPack;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<Icon_MainIcon>ASuite_Icon.ico</Icon_MainIcon>
<VerInfo_Locale>1033</VerInfo_Locale>
<Debugger_RunParams>debug</Debugger_RunParams>
<DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
<Icon_MainIcon>ASuite_Icon13.ico</Icon_MainIcon>
<Icon_MainIcon>ASuite_Icon.ico</Icon_MainIcon>
<DCC_DcuOutput>dcu64</DCC_DcuOutput>
<VerInfo_MajorVer>1</VerInfo_MajorVer>
<VerInfo_Build>0</VerInfo_Build>
<DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;$(DCC_Namespace)</DCC_Namespace>
<VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<DCC_DependencyCheckOutputName>bin\ASuite.exe</DCC_DependencyCheckOutputName>
Expand All @@ -82,19 +100,26 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_Optimize>False</DCC_Optimize>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_ExeOutput>bin</DCC_ExeOutput>
<DCC_ObjOutput>dcu</DCC_ObjOutput>
<DCC_HppOutput>dcu</DCC_HppOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_MapFile>3</DCC_MapFile>
<Icon_MainIcon>ASuite_Icon.ico</Icon_MainIcon>
<DCC_AssertionsAtRuntime>false</DCC_AssertionsAtRuntime>
<VerInfo_Build>1357</VerInfo_Build>
<VerInfo_Keys>CompanyName=SalvadorSoftware;FileVersion=2.0.0.1357;InternalName=;LegalTrademarks=;OriginalFilename=;ProductName=ASuite;ProductVersion=2.0;Comments=</VerInfo_Keys>
<VerInfo_Build>1358</VerInfo_Build>
<VerInfo_Keys>CompanyName=SalvadorSoftware;FileVersion=2.0.0.1358;InternalName=;LegalTrademarks=;OriginalFilename=;ProductName=ASuite;ProductVersion=2.0;Comments=</VerInfo_Keys>
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
<VerInfo_Locale>1033</VerInfo_Locale>
<DCC_Optimize>true</DCC_Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<Icon_MainIcon>ASuite_Icon.ico</Icon_MainIcon>
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
<VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_MajorVer>1</VerInfo_MajorVer>
<VerInfo_Build>4</VerInfo_Build>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.4;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_DebugDCUs>true</DCC_DebugDCUs>
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
Expand All @@ -106,14 +131,25 @@
<DCC_HppOutput>dcu</DCC_HppOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<VerInfo_Keys>CompanyName=SalvadorSoftware;FileVersion=2.0.0.1390;InternalName=;LegalTrademarks=;OriginalFilename=;ProductName=ASuite;ProductVersion=2.0;Comments=</VerInfo_Keys>
<VerInfo_Build>1390</VerInfo_Build>
<Icon_MainIcon>ASuite_Icon.ico</Icon_MainIcon>
<VerInfo_Keys>CompanyName=SalvadorSoftware;FileVersion=2.0.0.1392;InternalName=;LegalTrademarks=;OriginalFilename=;ProductName=ASuite;ProductVersion=2.0;Comments=</VerInfo_Keys>
<VerInfo_Build>1392</VerInfo_Build>
<ILINK_MapFileType>DetailedSegments</ILINK_MapFileType>
<MapFile>3</MapFile>
<DCC_MapFile>3</DCC_MapFile>
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
<VerInfo_Locale>1033</VerInfo_Locale>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
<Icon_MainIcon>ASuite_Icon.ico</Icon_MainIcon>
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
<DCC_MapFile>3</DCC_MapFile>
<VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_MajorVer>1</VerInfo_MajorVer>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.10;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER7;$(DCC_Define)</DCC_Define>
<VerInfo_Build>10</VerInfo_Build>
</PropertyGroup>
<ProjectExtensions>
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
Expand Down Expand Up @@ -161,11 +197,11 @@
<ModelSupport>False</ModelSupport>
<Platforms>
<Platform value="Win32">True</Platform>
<Platform value="Win64">False</Platform>
<Platform value="Win64">True</Platform>
</Platforms>
<Deployment>
<DeployFile LocalName="bin\ASuite.exe" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32">
<Platform Name="Win64">
<RemoteName>ASuite.exe</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
Expand All @@ -176,6 +212,18 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="bin\ASuite.exe" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>ASuite.exe</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="ASuite.inc" Configuration="Debug" Class="ProjectFile">
<Platform Name="Win64">
<RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployClass Required="true" Name="DependencyPackage">
<Platform Name="iOSDevice">
<Operation>1</Operation>
Expand Down
Binary file modified ASuite.res
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions build_debug64_asuite.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
call clean.bat
call utils\Run-Dependend-rsvars-From-Path.bat L B ASuite.dproj win64

pause
3 changes: 2 additions & 1 deletion build_debug_asuite.bat
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
call utils\Run-Dependend-rsvars-From-Path.bat L B ASuite.dproj
call clean.bat
call utils\Run-Dependend-rsvars-From-Path.bat L B ASuite.dproj win32

pause
4 changes: 4 additions & 0 deletions build_release64_asuite.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
call clean.bat
call utils\Run-Dependend-rsvars-From-Path.bat L R ASuite.dproj Win64

pause
3 changes: 2 additions & 1 deletion build_release_asuite.bat
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
call utils\Run-Dependend-rsvars-From-Path.bat L R ASuite.dproj
call clean.bat
call utils\Run-Dependend-rsvars-From-Path.bat L R ASuite.dproj win32

pause
1 change: 1 addition & 0 deletions clean.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ del /S /Q *.mes
del /S /Q *.mps
del /S /Q *.mpt
del /S /Q *.prf
del /S /Q *.rsm
del /S /Q *.stat
del /S /Q *.tci
del /S /Q *.tmp
Expand Down
9 changes: 5 additions & 4 deletions utils/Run-Dependend-rsvars-From-Path.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:bds
:: now %1 has been verified; verify %2
if !%2!==!! goto :bdsBegin
for %%v in (F fixTargets B msbuild R D C S RS Delphi CBuilder RadStudio) do if /I !%2!==!%%v! goto :bdsBegin
for %%v in (F fixTargets B msbuild R D C S RS Delphi CBuilder RadStudio win32 win64) do if /I !%2!==!%%v! goto :bdsBegin
echo Unknown BDS Target "%2"
goto :help

Expand Down Expand Up @@ -47,7 +47,7 @@
goto :bdsExe
:bdsExe
:: cannot pass %* as there is no way to get rid of %1 and %2, see http://stackoverflow.com/questions/9363080/how-to-make-shift-work-with-in-batch-files
call :%2 %3
call :%2 %3 %4
goto :bdsEnd
:missingTarget
echo missing one or more of "%requiredTargets%" in "%targetDirectory%"
Expand All @@ -65,12 +65,13 @@
:B
:msbuild
:: check if the project exists
call :do %msBuildExe% /target:build /p:DCC_BuildAllUnits=true /p:config=Debug %1 /l:FileLogger,Microsoft.Build.Engine;logfile="log.txt"
call :do %msBuildExe% /p:Platform=%2 /target:build /p:DCC_BuildAllUnits=true /p:config=Debug %1 /l:FileLogger,Microsoft.Build.Engine;logfile="log.txt"
goto :eof

:R
:: check if the project exists
call :do %msBuildExe% /target:build /p:DCC_BuildAllUnits=true /p:config=Release %1 /l:FileLogger,Microsoft.Build.Engine;logfile="log.txt"
echo %Platform%
call :do %msBuildExe% /p:Platform=%2 /target:build /p:DCC_BuildAllUnits=true /p:config=Release %1 /l:FileLogger,Microsoft.Build.Engine;logfile="log64.txt"
goto :eof

:: TODO add options for build Config 3, build Platform 4, search paths 5, conditional defines 6.
Expand Down
34 changes: 24 additions & 10 deletions utils/make_release.bat
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo off
::@echo off

if [%1]==[help] GOTO :help else GOTO :SetVars

Expand Down Expand Up @@ -27,27 +27,41 @@ if [%1]==[help] GOTO :help else GOTO :SetVars

:Build
call "%OLDDIR%\..\build_release_asuite.bat"
cd utils
%Map2Mab% ..\bin\asuite.exe
%StripRelocPath% /B ..\bin\asuite.exe
%UPXPath% --best ..\bin\asuite.exe
del ..\bin\asuite.map
%Map2Mab% bin\asuite.exe
%StripRelocPath% /B bin\asuite.exe
%UPXPath% --best bin\asuite.exe
pause
goto :CompressRelease

:Build64
call "%OLDDIR%\..\build_release64_asuite.bat"
%Map2Mab% bin\asuite.exe
%UPXPath% --best bin\asuite.exe
pause
goto :CompressRelease64

:CompressRelease
cd ..\bin
"%programfiles%\7-zip\7z.exe" a -tzip %OLDDIR%\asuite.zip
"%programfiles%\7-zip\7z.exe" a -t7z %OLDDIR%\asuite.7z
cd bin
"%programfiles%\7-zip\7z.exe" a -tzip %OLDDIR%\asuite.zip * -x!sqlite3-64.dll
"%programfiles%\7-zip\7z.exe" a -t7z %OLDDIR%\asuite.7z * -x!sqlite3-64.dll
cd ..
goto :Build64

:CompressRelease64
cd bin
"%programfiles%\7-zip\7z.exe" a -tzip %OLDDIR%\asuite_64.zip
"%programfiles%\7-zip\7z.exe" a -t7z %OLDDIR%\asuite_64.7z
cd ..
goto :RemoveAll

:RemoveAll
cd ..\..
cd ..
rd /s /q asuite
goto :eof

:GitLastCommit
git.exe clone --depth 1 https://github.com/salvadorbs/Asuite.git
pause
goto :RemoveGitFolder

:GitTag
Expand Down

0 comments on commit 20faa52

Please sign in to comment.