Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganize Tools #323

Merged
merged 8 commits into from
Jun 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
@AresModAchillesExpansion/keys/private
@Release/*
Tools/AchillesTestServer.bat
Tools/AchillesConnectToServer.bat
Tools/AchillesAddonBuilder.bat
*.bikey
*.biprivatekey
*.pbo
*.bisign
*.lnk
.vscode/

.idea
/*.iml
*.ini
Tools/AddonBuilder/config.ini
*.log
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ python:
before_script:
- pip3 install sqflint
script:
- python3 Tools/sqf_validator.py
- python3 Tools/config_style_checker.py
- python3 tools/travis/sqf_validator.py
- python3 tools/travis/config_style_checker.py
- sqflint -d @AresModAchillesExpansion/addons
notifications:
email: false
webhooks:
urls:
- https://mechilles.herokuapp.com/webhook
on_success: change
on_success: change
84 changes: 0 additions & 84 deletions Tools/AddonBuilder.bat

This file was deleted.

18 changes: 0 additions & 18 deletions Tools/find_unsafe_rc.sh

This file was deleted.

15 changes: 0 additions & 15 deletions Tools/git-bash.bat

This file was deleted.

72 changes: 0 additions & 72 deletions Tools/markdown_changeLog_to_steam.py

This file was deleted.

11 changes: 0 additions & 11 deletions Tools/markdown_test.txt

This file was deleted.

11 changes: 0 additions & 11 deletions Tools/markdown_test_steam.txt

This file was deleted.

Empty file removed Tools/unsafe_rc.log
Empty file.
106 changes: 106 additions & 0 deletions tools/AchillesAddonBuilder.bat.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
@echo off
set "startDir=%CD%"
REM switch to Achilles root folder
cd ..
set "AchillesRootFolderPath=%CD%"

REM /******************************************************************************/
REM Addon Builder script for windows (by Kex)
REM /******************************************************************************/
REM
REM Description:
REM ------------
REM Packs all folders in sourceDir and creates corresponding *.pbo in targetDir.
REM The script is parallelized and will create a window for each source folder.
REM
REM "Installation":
REM ---------------
REM 1) Copy AchillesAddonBuilder.bat.example and rename it to AchillesAddonBuilder.bat
REM 2) Adjust the USER CONFIGURATIONS below
REM 3) Make sure that the AchillesAddonBuilder from Arma 3 Tools is in the PATH env variable
REM
REM Usage
REM -----
REM Command Line Arguments:
REM 1) (optional) version for bikey e.g. "0.0.1" ("dev" by default)
REM
REM Examples:
REM ---------
REM 1) AchillesAddonBuilder.bat 0.0.1
REM 2) AchillesAddonBuilder.bat

REM /******************************************************************************/
REM START OF USER CONFIGURATIONS
REM /******************************************************************************/

REM optional argument: version of bikey: <prefix>_<version>.biprivatekey
set keyVersion=%1

REM Path for the folder where the source folders are located
set "sourceDir=%AchillesRootFolderPath%\@AresModAchillesExpansion\addons"
REM Path for the folder where the *.pbo's shall be moved
set "targetDir=%AchillesRootFolderPath%\@AresModAchillesExpansion\addons"
REM Prefix: you can access your addon files via \<prefix>\<pbo name>\<file>
REM Prefix: if projPrefix is "" then \<pbo name>\<file>
set projPrefix=achilles
REM Prefix for your bikey: <prefix>_<version>.biprivatekey
set privKeyPrefix=achilles
REM Default version (if you don't specify the version as an argument): <prefix>_dev.biprivatekey
REM if no argument is passed and keyVersionDefault="", then the addon doesn't get signed
set "keyVersionDefault="
REM Folder where the biprivatekey is located
set "privKeyDir=%AchillesRootFolderPath%\@AresModAchillesExpansion\keys\private"
REM Temporary folder
set "tmpDir=%TEMP%"

REM /******************************************************************************/
REM END OF USER CONFIGURATIONS
REM /******************************************************************************/

REM get biprivatekey file name
set "privKey="
if "%keyVersion%"=="" (
if not "%keyVersionDefault%"=="" (
set privKey=%privKeyPrefix%_%keyVersion%.biprivatekey
)
) else (
set privKey=%privKeyPrefix%_%keyVersion%.biprivatekey
)

REM Check if paths are valid
set "invalidpath="
if not exist "%sourceDir%" set "invalidpath=%sourceDir%"
if not exist "%targetDir%" set "invalidpath=%targetDir%"
if not "%privKey%"=="" (
if not exist "%privKeyDir%\%privKey%" set "invalidpath=%privKeyDir%\%privKey%"
)
if not exist "%tmpDir%" set "invalidpath=%tmpDir%"
if not "%invalidpath%"=="" (
call:PERROR "%invalidpath% not found!"
call:PERROR "Fix your USER CONFIGURATIONS!"
echo HINT: Opening %0
start notepad %0
echo.
pause
goto EOS
)

cd /d %sourceDir%
for /d %%D in (*) do (
if "%privKey%"=="" (
start "AddonBuilder: %%D" cmd /c "AddonBuilder "%sourceDir%\%%D" "%targetDir%" -packonly -temp="%tmpDir%" -prefix="%projPrefix%\%%D" -binarizeFullLogs"
) else (
start "AddonBuilder: %%D" cmd /c "AddonBuilder "%sourceDir%\%%D" "%targetDir%" -packonly -temp="%tmpDir%" -sign="%privKeyDir%\%privKey%" -prefix="%projPrefix%\%%D" -binarizeFullLogs"
)
)

goto EOS

:PERROR
%Windir%\System32\WindowsPowerShell\v1.0\Powershell.exe write-host -foregroundcolor Red "ERROR: %1"
GOTO:EOF

:EOS
cd /d %startDir%
echo.

Loading