diff --git a/.travis.yml b/.travis.yml index 39056aef..180fd865 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,9 @@ addons: - libxss-dev - libasound2-dev - libxtst-dev + # Scripting dependencies + - inkscape + - imagemagick sauce_connect: true cache: @@ -59,8 +62,10 @@ install: - export PATH="$PWD/doxygen-1.8.12/bin:$PATH" before_script: + - mkdir build + - node scripts/create_ico.js # Move into the cloned LOOT repo build path. - - mkdir build && cd build + - cd build # Link dynamically to the C++ standard library runtime. - cmake .. -DBOOST_ROOT=~/boost_1_61_0 diff --git a/appveyor.yml b/appveyor.yml index 3b415f45..a182135a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,7 @@ environment: secure: u234T2688DZmz4JH5+0iAHcUcL2fEIGculb8655bn4B1q7GckhplsitzgEbv3NFc install: - - choco install -y doxygen.portable InnoSetup + - choco install -y doxygen.portable InnoSetup inkscape imagemagick.tool - python -m pip install sphinx breathe sphinx_rtd_theme - npm install - .\node_modules\.bin\bower install @@ -26,6 +26,8 @@ install: before_build: - cd %APPVEYOR_BUILD_FOLDER% - ps: mkdir build + - set PATH=C:\ProgramData\chocolatey\lib\imagemagick.tool\tools;%PATH%;C:\Program Files\Inkscape + - node scripts\create_ico.js - cd build - cmake .. -G "Visual Studio 14 2015" -DBOOST_ROOT="C:\projects\boost_1_61_0" diff --git a/docs/api/Doxyfile b/docs/api/Doxyfile index a092323e..40b2e3ea 100644 --- a/docs/api/Doxyfile +++ b/docs/api/Doxyfile @@ -51,7 +51,7 @@ PROJECT_BRIEF = "A load order optimisation tool for various games by Be # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = C:/Users/Oliver/Documents/GitHub/LOOT/loot/resources/icon.ico +PROJECT_LOGO = # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is diff --git a/resources/icon.ico b/resources/icon.ico deleted file mode 100644 index 04576965..00000000 Binary files a/resources/icon.ico and /dev/null differ diff --git a/scripts/create_ico.js b/scripts/create_ico.js index 218d5fa7..52ef7074 100644 --- a/scripts/create_ico.js +++ b/scripts/create_ico.js @@ -4,7 +4,7 @@ const path = require('path'); const svgPath = path.join('resources', 'icon.svg'); const buildDirectory = path.join('build', 'icon'); -const outputPath = path.join('resources', 'icon.ico'); +const outputPath = path.join(buildDirectory, 'icon.ico'); const sizes = [16, 20, 24, 30, 32, 36, 40, 48, 60, 64, 72, 80, 96, 128, 256]; @@ -29,5 +29,3 @@ sizes.forEach((size) => { convertArgs.push(outputPath); childProcess.execFileSync('convert', convertArgs); - -fs.removeSync(buildDirectory); diff --git a/scripts/installer.iss b/scripts/installer.iss index 0575e0ac..746ee882 100644 --- a/scripts/installer.iss +++ b/scripts/installer.iss @@ -47,7 +47,7 @@ DefaultDirName={pf}\{#MyAppName} SourceDir=..\ OutputBaseFilename=LOOT Installer OutputDir=build -SetupIconFile=resources\icon.ico +SetupIconFile=build\icon\icon.ico Compression=lzma SolidCompression=yes DisableDirPage=no diff --git a/src/resource.rc b/src/resource.rc index eb295918..0fd53699 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -19,4 +19,4 @@ BEGIN VALUE "Translation", 0x409, 1200 END END -MAINICON ICON "../resources/icon.ico" +MAINICON ICON "../build/icon/icon.ico"