mirror of
https://github.com/danbulant/Cosmos
synced 2026-05-24 12:35:31 +00:00
output directory in install.bat was always the same, solve this by checking directory on start
This commit is contained in:
parent
82edec65d7
commit
ecf320d14d
2 changed files with 24 additions and 8 deletions
|
|
@ -1,14 +1,22 @@
|
||||||
@echo off
|
@echo off
|
||||||
|
|
||||||
|
rem click on install.bat and run as admin the path in %CD% is c:\windows\system32
|
||||||
|
if "%CD%" == "%SystemRoot%\system32" goto adminClick
|
||||||
|
goto adminCalledFromACmdShellOrUnprivileged
|
||||||
|
|
||||||
|
:adminClick
|
||||||
REM Necessary to set dir when running as admin
|
REM Necessary to set dir when running as admin
|
||||||
cd /D %~dp0
|
cd /D %~dp0
|
||||||
|
|
||||||
echo Compiling cosmos
|
:adminCalledFromACmdShellOrUnprivileged
|
||||||
set "THE_OUTPUT_PATH=%CD%"
|
|
||||||
set "ProgFiles=%ProgramFiles%
|
|
||||||
if not "[%ProgramFiles(x86)%]"=="[]" set "ProgFiles=%ProgramFiles(x86)%
|
|
||||||
|
|
||||||
cd "..\..\source"
|
echo Compiling cosmos
|
||||||
|
set THE_OUTPUT_PATH=%CD%
|
||||||
|
set ProgFiles=%ProgramFiles%
|
||||||
|
if not "%ProgramFiles(x86)%"=="" set "ProgFiles=%ProgramFiles(x86)%
|
||||||
|
|
||||||
|
cd /D %~dp0
|
||||||
|
cd ..\..\source
|
||||||
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild Cosmos.sln /maxcpucount /verbosity:normal /nologo /p:Configuration=Bootstrap /p:Platform=x86 "/p:OutputPath=%THE_OUTPUT_PATH%"
|
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild Cosmos.sln /maxcpucount /verbosity:normal /nologo /p:Configuration=Bootstrap /p:Platform=x86 "/p:OutputPath=%THE_OUTPUT_PATH%"
|
||||||
rem /t:Rebuild
|
rem /t:Rebuild
|
||||||
cd ..\Build\VSIP\
|
cd ..\Build\VSIP\
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,15 @@
|
||||||
@echo off
|
@echo off
|
||||||
|
|
||||||
|
rem click on install.bat and run as admin the path in %CD% is c:\windows\system32
|
||||||
|
if "%CD%" == "%SystemRoot%\system32" goto adminClick
|
||||||
|
goto adminCalledFromACmdShellOrUnprivileged
|
||||||
|
|
||||||
|
:adminClick
|
||||||
REM Necessary to set dir when running as admin
|
REM Necessary to set dir when running as admin
|
||||||
cd /D %~dp0
|
cd /D %~dp0
|
||||||
|
|
||||||
|
:adminCalledFromACmdShellOrUnprivileged
|
||||||
|
|
||||||
rem Prob not needed at all anymore, can delete
|
rem Prob not needed at all anymore, can delete
|
||||||
rem echo Killing old stuff - Need to modify not to be user specific
|
rem echo Killing old stuff - Need to modify not to be user specific
|
||||||
rem del /S /Q "C:\Users\Atmoic\AppData\Local\Microsoft\VisualStudio\9.0\ProjectAssemblies\*.*"
|
rem del /S /Q "C:\Users\Atmoic\AppData\Local\Microsoft\VisualStudio\9.0\ProjectAssemblies\*.*"
|
||||||
|
|
@ -10,10 +17,11 @@ rem rmdir /S /Q "C:\Users\Atmoic\AppData\Local\Microsoft\VisualStudio\9.0\Projec
|
||||||
rem del /S /Q "C:\Users\Atmoic\AppData\Roaming\Cosmos User Kit\Build\VSIP\*.*"
|
rem del /S /Q "C:\Users\Atmoic\AppData\Roaming\Cosmos User Kit\Build\VSIP\*.*"
|
||||||
|
|
||||||
echo Compiling cosmos
|
echo Compiling cosmos
|
||||||
cd ..\Build\VSIP
|
|
||||||
set "THE_OUTPUT_PATH=%CD%"
|
set "THE_OUTPUT_PATH=%CD%"
|
||||||
cd "..\..\source"
|
|
||||||
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild Cosmos2010.sln /maxcpucount /verbosity:normal /nologo /p:Configuration=Bootstrap /p:Platform=x86 /t:Rebuild "/p:OutputPath=%THE_OUTPUT_PATH%"
|
cd /D %~dp0
|
||||||
|
cd ..\source
|
||||||
|
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild Cosmos.sln /maxcpucount /verbosity:normal /nologo /p:Configuration=Bootstrap /p:Platform=x86 "/p:OutputPath=%THE_OUTPUT_PATH%"
|
||||||
rem /t:Rebuild
|
rem /t:Rebuild
|
||||||
cd ..\Build\VSIP\
|
cd ..\Build\VSIP\
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue