Skip to content

Commit 2e24afb

Browse files
committed
Renamed "asar-standalone" output file to "asar"
1 parent b67e8fe commit 2e24afb

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

.github/workflows/cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
# Windows MSVC tests
4141
- name: App Test
4242
# Run app test
43-
run: ${{github.workspace}}/build/asar-tests/${{env.BUILD_TYPE}}/asar-app-test.exe ${{github.workspace}}/build/asar/${{env.BUILD_TYPE}}/asar-standalone.exe "${{github.workspace}}/tests" "${{github.workspace}}/dummy_rom.sfc" ${{github.workspace}}/build/temp
43+
run: ${{github.workspace}}/build/asar-tests/${{env.BUILD_TYPE}}/asar-app-test.exe ${{github.workspace}}/build/asar/${{env.BUILD_TYPE}}/asar.exe "${{github.workspace}}/tests" "${{github.workspace}}/dummy_rom.sfc" ${{github.workspace}}/build/temp
4444
if: ${{ contains(matrix.config, 'msvc') }}
4545

4646
- name: DLL Test
@@ -51,7 +51,7 @@ jobs:
5151
# Tests for other platforms
5252
- name: App Test
5353
# Run app test
54-
run: ${{github.workspace}}/build/asar-tests/asar-app-test ${{github.workspace}}/build/asar/asar-standalone "${{github.workspace}}/tests" "${{github.workspace}}/dummy_rom.sfc" ${{github.workspace}}/build/temp
54+
run: ${{github.workspace}}/build/asar-tests/asar-app-test ${{github.workspace}}/build/asar/asar "${{github.workspace}}/tests" "${{github.workspace}}/dummy_rom.sfc" ${{github.workspace}}/build/temp
5555
if: ${{ !contains(matrix.config, 'msvc') }}
5656

5757
- name: DLL Test

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ build:
4747
verbosity: minimal
4848

4949
artifacts:
50-
- path: build\asar\**\asar-standalone.exe
50+
- path: build\asar\**\asar.exe
5151
- path: build\asar\**\*asar.dll
5252

5353
configuration: MinSizeRel
@@ -57,7 +57,7 @@ test_script:
5757
- cmd: >-
5858
asar-tests\%CONFIGURATION%\asar-dll-test.exe %APPVEYOR_BUILD_FOLDER%\build\asar\%CONFIGURATION%\asar.dll %APPVEYOR_BUILD_FOLDER%\tests ..\dummy_rom.sfc %APPVEYOR_BUILD_FOLDER%\tests_tmp_dll
5959
60-
asar-tests\%CONFIGURATION%\asar-app-test.exe asar\%CONFIGURATION%\asar-standalone.exe %APPVEYOR_BUILD_FOLDER%\tests ..\dummy_rom.sfc %APPVEYOR_BUILD_FOLDER%\tests_tmp_app
60+
asar-tests\%CONFIGURATION%\asar-app-test.exe asar\%CONFIGURATION%\asar.exe %APPVEYOR_BUILD_FOLDER%\tests ..\dummy_rom.sfc %APPVEYOR_BUILD_FOLDER%\tests_tmp_app
6161
6262
deploy:
6363
provider: FTP
@@ -86,4 +86,4 @@ for:
8686
- cmd: >-
8787
asar-tests\asar-dll-test.exe %APPVEYOR_BUILD_FOLDER%\build\asar\libasar.dll %APPVEYOR_BUILD_FOLDER%\tests ..\dummy_rom.sfc %APPVEYOR_BUILD_FOLDER%\tests_tmp_dll
8888
89-
asar-tests\asar-app-test.exe asar\asar-standalone.exe %APPVEYOR_BUILD_FOLDER%\tests ..\dummy_rom.sfc %APPVEYOR_BUILD_FOLDER%\tests_tmp_app
89+
asar-tests\asar-app-test.exe asar\asar.exe %APPVEYOR_BUILD_FOLDER%\tests ..\dummy_rom.sfc %APPVEYOR_BUILD_FOLDER%\tests_tmp_app

generate_release_zip.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
zipf = zipfile.ZipFile("asar"+sys.argv[1]+".zip", 'x', compression=zipfile.ZIP_DEFLATED)
1111

1212
build_server_prefix = "https://random.muncher.se/ftp/asar/windows/xp_compat/build/asar/MinSizeRel/"
13-
with urllib.request.urlopen(build_server_prefix + "asar-standalone.exe") as resp:
13+
with urllib.request.urlopen(build_server_prefix + "asar.exe") as resp:
1414
exe_data = resp.read()
1515
with urllib.request.urlopen(build_server_prefix + "asar.dll") as resp:
1616
dll_data = resp.read()

run_tests.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ set ABS=%ABS:~0,-1%
33
set CONFIG=Release
44
mkdir tests_tmp_dll tests_tmp_app
55
%ABS%\asar-tests\%CONFIG%\asar-dll-test.exe %ABS%\asar\%CONFIG%\asar.dll %ABS%\tests %ABS%\dummy_rom.sfc %ABS%\tests_tmp_dll
6-
%ABS%\asar-tests\%CONFIG%\asar-app-test.exe %ABS%\asar\%CONFIG%\asar-standalone.exe %ABS%\tests %ABS%\dummy_rom.sfc %ABS%\tests_tmp_app
6+
%ABS%\asar-tests\%CONFIG%\asar-app-test.exe %ABS%\asar\%CONFIG%\asar.exe %ABS%\tests %ABS%\dummy_rom.sfc %ABS%\tests_tmp_app
77
@pause

run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
ABS=$(pwd)
22
mkdir tests_tmp_dll tests_tmp_app
33
$ABS/asar-tests/asar-dll-test $ABS/asar/libasar.so $ABS/tests $ABS/dummy_rom.sfc $ABS/tests_tmp_dll
4-
$ABS/asar-tests/asar-app-test $ABS/asar/asar-standalone $ABS/tests $ABS/dummy_rom.sfc $ABS/tests_tmp_app
4+
$ABS/asar-tests/asar-app-test $ABS/asar/asar $ABS/tests $ABS/dummy_rom.sfc $ABS/tests_tmp_app

src/asar/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ if(ASAR_GEN_EXE)
207207
target_compile_options(asar-standalone PRIVATE -fprofile-arcs -ftest-coverage)
208208
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov --coverage -fprofile-arcs")
209209
endif()
210+
211+
set_target_properties(asar-standalone PROPERTIES OUTPUT_NAME "asar")
210212
endif(ASAR_GEN_EXE)
211213

212214

0 commit comments

Comments
 (0)