commit
a284b0f2b9
13 files changed
+3962
-895
No files matched your search
+4
-5
@@ -56,11 +56,10 @@ tx.exe
|
|||||||
/VocaluxeLib/bin
|
/VocaluxeLib/bin
|
||||||
/ServerLib/bin/ClientServerLib.dll
|
/ServerLib/bin/ClientServerLib.dll
|
||||||
/Installer/setup-cache
|
/Installer/setup-cache
|
||||||
/Installer/setup-SetupFiles
|
/Installer/Files
|
||||||
/Installer/vocaluxe-*-setup.exe
|
/Installer/log.txt
|
||||||
/Installer/Vocaluxe*.rar
|
/Installer/setup-cache
|
||||||
/Installer/Prerequisites/GStreamer x64/gstreamer-1.0-x86_64-1.4.1.msi
|
/Installer/Setup Files
|
||||||
/Installer/Prerequisites/GStreamer x86/gstreamer-1.0-x86-1.4.1.msi
|
|
||||||
/WebserverInitalConfig/bin
|
/WebserverInitalConfig/bin
|
||||||
/PhoneGap/
|
/PhoneGap/
|
||||||
/TestResults
|
/TestResults
|
||||||
|
|||||||
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
@@ -1,14 +0,0 @@
|
|||||||
REM compile x64
|
|
||||||
call "%VS110COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
|
|
||||||
devenv.com ..\Vocaluxe.sln /Rebuild "InstallerWin|x64"
|
|
||||||
|
|
||||||
REM remove old x64 executables if found and rename
|
|
||||||
if exist "..\Output\Vocaluxe_x64.exe" del "..\Output\Vocaluxe_x64.exe"
|
|
||||||
ren "..\Output\Vocaluxe.exe" "Vocaluxe_x64.exe"
|
|
||||||
|
|
||||||
REM compile x86
|
|
||||||
call "%VS110COMNTOOLS%\..\..\VC\vcvarsall.bat" x86
|
|
||||||
devenv.com ..\Vocaluxe.sln /Rebuild "InstallerWin|x86"
|
|
||||||
|
|
||||||
REM compile installer
|
|
||||||
AdvancedInstaller.com /rebuild setup.aip
|
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
:: Build script for vocaluxe installer (x86 and x64 versions)
|
||||||
|
::
|
||||||
|
:: Requirements
|
||||||
|
:: - wget.exe: http://gnuwin32.sourceforge.net/packages/wget.htm
|
||||||
|
:: - unzip.exe: http://gnuwin32.sourceforge.net/packages/unzip.htm
|
||||||
|
:: - nuget.exe: https://www.nuget.org/downloads
|
||||||
|
:: - Visual Studio with devenv.exe (should be located in somewhere in Visual Studio folder, e.g. C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE)
|
||||||
|
:: - AdvancedInstaller
|
||||||
|
|
||||||
|
@ECHO OFF
|
||||||
|
echo Cloning vocaluxe from github and checkout master
|
||||||
|
if exist "Files" (
|
||||||
|
cd Files
|
||||||
|
git checkout -q develop >> log.txt
|
||||||
|
git pull -q >> log.txt
|
||||||
|
cd ../
|
||||||
|
) else (
|
||||||
|
git clone -q https://github.com/Vocaluxe/Vocaluxe.git Files > log.txt
|
||||||
|
cd Files
|
||||||
|
git checkout -q develop >> log.txt
|
||||||
|
cd ../
|
||||||
|
)
|
||||||
|
echo - Done
|
||||||
|
echo.
|
||||||
|
|
||||||
|
echo Download ambient videos and move them to themes folder
|
||||||
|
wget --append-output=log.txt -q -O videos.zip https://github.com/lukeIam/VocaluxeDependencies/blob/master/zips/themes/vocaluxe.themes.ambient.video.zip?raw=true || goto :error
|
||||||
|
unzip -q -o -d Files/Output videos.zip || goto :error
|
||||||
|
del /q videos.zip >> log.txt || goto :error
|
||||||
|
echo - Done
|
||||||
|
echo.
|
||||||
|
|
||||||
|
echo Delete lib-folder to prevent packing wrong dlls
|
||||||
|
del /q Files\Output\libs >> log.txt || goto :error
|
||||||
|
echo - Done
|
||||||
|
echo.
|
||||||
|
|
||||||
|
echo Restore dependencies and build x64
|
||||||
|
nuget restore Files/Vocaluxe.sln >> log.txt || goto :error
|
||||||
|
devenv Files/Vocaluxe.sln /Build "InstallerWin|x64" >> log.txt || goto :error
|
||||||
|
echo - Done
|
||||||
|
echo.
|
||||||
|
|
||||||
|
echo Build x64 installer
|
||||||
|
AdvancedInstaller.com /rebuild setup.aip -buildslist x64 >> log.txt || goto :error
|
||||||
|
echo - Done
|
||||||
|
echo.
|
||||||
|
|
||||||
|
echo Delete lib-folder to prevent packing wrong dlls
|
||||||
|
del /q Files\Output\libs >> log.txt || goto :error
|
||||||
|
echo - Done
|
||||||
|
echo.
|
||||||
|
|
||||||
|
echo Restore dependencies and build x86
|
||||||
|
nuget restore Files/Vocaluxe.sln >> log.txt || goto :error
|
||||||
|
devenv Files/Vocaluxe.sln /Build "InstallerWin|x86" >> log.txt || goto :error
|
||||||
|
echo - Done
|
||||||
|
echo.
|
||||||
|
|
||||||
|
echo Build x86 installer
|
||||||
|
AdvancedInstaller.com /rebuild setup.aip -buildslist x86 >> log.txt || goto :error
|
||||||
|
echo - Done
|
||||||
|
echo.
|
||||||
|
|
||||||
|
echo Everything is done!
|
||||||
|
|
||||||
|
pause
|
||||||
|
goto :EOF
|
||||||
|
|
||||||
|
:error
|
||||||
|
echo Failed with error #%errorlevel%.
|
||||||
|
echo See log.txt for more details.
|
||||||
|
pause
|
||||||
|
exit /b %errorlevel%
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
@echo off
|
|
||||||
SET version=v0.3.0
|
|
||||||
SET status=Beta
|
|
||||||
SET buildnum=0081
|
|
||||||
SET buildname=Vocaluxe %version% %status% (%buildnum%).rar
|
|
||||||
|
|
||||||
REM compile x64
|
|
||||||
call "%VS110COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
|
|
||||||
devenv.com ..\Vocaluxe.sln /Rebuild "ReleaseWin|x64"
|
|
||||||
|
|
||||||
REM remove old x64 executables if found and rename
|
|
||||||
if exist "..\Output\Vocaluxe_x64.exe" del "..\Output\Vocaluxe_x64.exe"
|
|
||||||
ren "..\Output\Vocaluxe.exe" "Vocaluxe_x64.exe"
|
|
||||||
|
|
||||||
REM compile x86
|
|
||||||
call "%VS110COMNTOOLS%\..\..\VC\vcvarsall.bat" x86
|
|
||||||
devenv.com ..\Vocaluxe.sln /Rebuild "ReleaseWin|x86"
|
|
||||||
|
|
||||||
REM package
|
|
||||||
rar a -r -ep1 -x..\Output\CoverDB.sqlite -x..\Output\HighscoreDB.sqlite -x..\Output\*.log -x..\Output\*.pdb -x..\Output\Config.xml -x..\Output\Vocaluxe.vshost* -x..\Output\Songs -x..\Output\Screenshots -x..\Output\Playlists "%buildname%" "..\Output\*"
|
|
||||||
+3864
-846
File diff suppressed because it is too large.
Load diff
@@ -193,11 +193,11 @@ namespace Vocaluxe.Base
|
|||||||
//Folders
|
//Folders
|
||||||
public static readonly List<string> SongFolders = new List<string>
|
public static readonly List<string> SongFolders = new List<string>
|
||||||
{
|
{
|
||||||
#if WIN
|
#if INSTALLER
|
||||||
|
Path.Combine(CSettings.DataFolder, CSettings.FolderNameSongs),
|
||||||
|
CSettings.FolderNameSongs
|
||||||
|
#elif WIN
|
||||||
CSettings.FolderNameSongs
|
CSettings.FolderNameSongs
|
||||||
#elif INSTALLER
|
|
||||||
CSettings.FolderNameSongs,
|
|
||||||
Path.Combine(CSettings.DataFolder, CSettings.FolderNameSongs)
|
|
||||||
#elif LINUX
|
#elif LINUX
|
||||||
Path.Combine(CSettings.DataFolder, CSettings.FolderNameSongs)
|
Path.Combine(CSettings.DataFolder, CSettings.FolderNameSongs)
|
||||||
#endif
|
#endif
|
||||||
@@ -208,11 +208,11 @@ namespace Vocaluxe.Base
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static readonly List<string> ProfileFolders = new List<string>
|
public static readonly List<string> ProfileFolders = new List<string>
|
||||||
{
|
{
|
||||||
#if WIN
|
#if INSTALLER
|
||||||
|
Path.Combine(CSettings.DataFolder, CSettings.FolderNameProfiles),
|
||||||
|
CSettings.FolderNameProfiles
|
||||||
|
#elif WIN
|
||||||
CSettings.FolderNameProfiles
|
CSettings.FolderNameProfiles
|
||||||
#elif INSTALLER
|
|
||||||
CSettings.FolderNameProfiles,
|
|
||||||
Path.Combine(CSettings.DataFolder, CSettings.FolderNameProfiles)
|
|
||||||
#elif LINUX
|
#elif LINUX
|
||||||
Path.Combine(CSettings.DataFolder, CSettings.FolderNameProfiles)
|
Path.Combine(CSettings.DataFolder, CSettings.FolderNameProfiles)
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -116,13 +116,20 @@ namespace Vocaluxe
|
|||||||
public static bool CheckRequirements()
|
public static bool CheckRequirements()
|
||||||
{
|
{
|
||||||
#if WIN
|
#if WIN
|
||||||
if (!_IsVC2012Installed())
|
if (!_IsVC2010Installed())
|
||||||
|
{
|
||||||
|
CLog.LogError(
|
||||||
|
"VC++ 2010 Redistributables are missing. Please install them first. \r\nDownload(x86): https://www.microsoft.com/de-de/download/details.aspx?id=5555 \r\nDownload(x64): https://www.microsoft.com/de-de/download/details.aspx?id=14632",
|
||||||
|
true, true);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
/*if (!_IsVC2012Installed())
|
||||||
{
|
{
|
||||||
CLog.LogError(
|
CLog.LogError(
|
||||||
"VC++ 2012 Redistributables are missing. Please install them first.\r\nDownload: http://www.microsoft.com/de-de/download/details.aspx?id=30679",
|
"VC++ 2012 Redistributables are missing. Please install them first.\r\nDownload: http://www.microsoft.com/de-de/download/details.aspx?id=30679",
|
||||||
true, true);
|
true, true);
|
||||||
return false;
|
return false;
|
||||||
}
|
}*/
|
||||||
/*
|
/*
|
||||||
bool vc2008Installed = _IsVC2008Installed();
|
bool vc2008Installed = _IsVC2008Installed();
|
||||||
if (!vc2008Installed)
|
if (!vc2008Installed)
|
||||||
|
|||||||
@@ -92,6 +92,9 @@ namespace Vocaluxe
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Create data folder
|
||||||
|
Directory.CreateDirectory(CSettings.DataFolder);
|
||||||
|
|
||||||
// Init Log
|
// Init Log
|
||||||
CLog.Init();
|
CLog.Init();
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user