Skip to content

Commit

Permalink
version 7.6 is here
Browse files Browse the repository at this point in the history
  • Loading branch information
Anime4000 committed Dec 13, 2017
1 parent 456e606 commit d010512
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 15 deletions.
35 changes: 34 additions & 1 deletion Makefile.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ cd /d "%~dp0"
set NETCOMPILER="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
set ISCC="%PROGRAMFILES(X86)%\Inno Setup 5\iscc.exe"

set WINRAR="%PROGRAMFILES%\WINRAR\WinRAR.exe"
set SEVENZIP="%PROGRAMFILES%\7-Zip\7z.exe"

set UNZIPCMD1=do not edit
set UNZIPCMD2=do not edit

echo Checking Visual Studio
IF NOT EXIST %NETCOMPILER% (
echo Need Visual Studio 2017
Expand All @@ -18,9 +24,29 @@ IF NOT EXIST %ISCC% (
goto FAIL
)

echo Checking Archive Utility (WinRAR)
IF EXIST %WINRAR% (
set UNZIPCMD1=%WINRAR% x -ibck
set UNZIPCMD2=
) ELSE IF EXIST %SEVENZIP% (
set UNZIPCMD1=%SEVENZIP% x
set UNZIPCMD2=-y -o
) ELSE (
echo Need 7-zip or WinRAR
goto FAIL
)

echo Little housekeeping
IF EXIST "%~dp0\build" (
rmdir /s /q "%~dp0\build"
rmdir /s /q "build"
)

IF EXIST "%~dp0\prerequisite\32bit" (
rmdir /s /q "prerequisite\32bit"
)

IF EXIST "%~dp0\prerequisite\64bit" (
rmdir /s /q "prerequisite\64bit"
)

echo Compiling...
Expand All @@ -29,6 +55,9 @@ timeout /t 5 >nul

echo Copying main files
mkdir build
mkdir prerequisite\32bit
mkdir prerequisite\64bit

robocopy ifme\bin\Release\branding build\branding /E
robocopy ifme\bin\Release\lang build\lang /E
robocopy ifme\bin\Release\preset build\preset /E
Expand All @@ -53,6 +82,10 @@ copy changelog.txt build\
copy license.txt build\
copy patents.txt build\

echo Unpacking prerequisite files
%UNZIPCMD1% prerequisite\plugin32.tar.xz %UNZIPCMD2%"prerequisite\32bit"
%UNZIPCMD1% prerequisite\plugin64.tar.xz %UNZIPCMD2%"prerequisite\64bit"

echo Creating Installer
%ISCC% installer.iss

Expand Down
19 changes: 7 additions & 12 deletions configure.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ set SEVENZIP="%PROGRAMFILES%\7-Zip\7z.exe"
set PLUGIN32=https://sourceforge.net/projects/ifme/files/plugin/plugin-basic_2017-12-12_i686.tar.xz
set PLUGIN64=https://sourceforge.net/projects/ifme/files/plugin/plugin-basic_2017-12-12_amd64.tar.xz

set UNZIP1=do not edit
set UNZIP2=do not edit
set UNZIPCMD1=do not edit
set UNZIPCMD2=do not edit

echo Checking archive utility 7-zip or WinRAR
IF EXIST %SEVENZIP% goto USE7ZIP
Expand All @@ -20,20 +20,19 @@ goto FAIL

:USE7ZIP
echo %SEVENZIP% found!
set UNZIP1=%SEVENZIP% x
set UNZIP2=-y -o
set UNZIPCMD1=%SEVENZIP% x
set UNZIPCMD2=-y -o
goto STAGE1

:USEWINRAR
echo %WINRAR% found!
set UNZIP1=%WINRAR% x -ibck
set UNZIP2=
set UNZIPCMD1=%WINRAR% x -ibck
set UNZIPCMD2=
goto STAGE1

:STAGE1
echo Creating folders
mkdir prerequisite\32bit\
mkdir prerequisite\64bit\
mkdir prerequisite

echo Download prerequisite files
IF NOT EXIST "%~dp0\prerequisite\FontReg32.exe" (
Expand All @@ -53,10 +52,6 @@ IF NOT EXIST "%~dp0\prerequisite\plugin64.tar.xz" (
powershell -command "& { (new-object System.Net.WebClient).DownloadFile('%PLUGIN32%','prerequisite\plugin64.tar.xz') }"
)

echo Unpacking prerequisite files
%UNZIP1% prerequisite\plugin32.tar.xz %UNZIP2%"prerequisite\32bit"
%UNZIP1% prerequisite\plugin64.tar.xz %UNZIP2%"prerequisite\64bit"

echo Complete, now you can make
goto DONE

Expand Down
3 changes: 2 additions & 1 deletion installer.iss
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ AppUpdatesURL={#MyAppURL}
DefaultDirName={pf}\{#MyAppName}
DefaultGroupName={#MyAppName}
AllowNoIcons=yes
DisableWelcomePage=no
ArchitecturesInstallIn64BitMode=x64

SourceDir=build
Expand All @@ -33,7 +34,7 @@ Compression=lzma2/ultra64
SolidCompression=yes

SetupIconFile=..\installer\image_unboxing.ico
WizardImageFile=..\installer\image_banner2.bmp
WizardImageFile=..\installer\image_banner1.bmp
WizardSmallImageFile=..\installer\image_small.bmp

OutputDir=..\
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.5
7.6

0 comments on commit d010512

Please sign in to comment.