Skip to content

Commit 6ae05b8

Browse files
committed
feat: generate portable installer only (#19)
* migrate to winget portable installer * remove unused tool from build
1 parent cb8c540 commit 6ae05b8

File tree

5 files changed

+11
-44
lines changed

5 files changed

+11
-44
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v3
1717
- uses: actions/download-artifact@v3
1818
- run: |
19-
gh release create "${TAG}" --notes "Lua ${TAG}" ./build/*.msi ./build/*.zip
19+
gh release create "${TAG}" --notes "Lua ${TAG}" ./build/*.zip
2020
env:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2222
TAG: ${{ inputs.tag }}

.github/workflows/reusable-package.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
steps:
88
- uses: actions/checkout@v3
99
- name: Install required tools
10-
run: choco install ninja ghostscript
10+
run: choco install ninja
1111
- name: Generate Ninja build
1212
run: cmake -B build -G Ninja -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_C_COMPILER=clang
1313
- name: Package
@@ -16,6 +16,5 @@ jobs:
1616
with:
1717
name: build
1818
path: |
19-
build/*.msi
2019
build/*.zip
2120
if-no-files-found: error

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ lua-*/
1616
luarocks-*/
1717
*.gz
1818
*.zip
19-
lua-logo-nolabel.ps

CMakeLists.txt

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,6 @@ if(WIN32)
3333
DESTINATION ${CMAKE_CURRENT_LIST_DIR}
3434
)
3535
endif()
36-
37-
set(LUA_LOGO lua-logo-nolabel.ps)
38-
if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/${LUA_LOGO})
39-
file(DOWNLOAD https://www.lua.org/images/${LUA_LOGO}
40-
${CMAKE_CURRENT_LIST_DIR}/${LUA_LOGO}
41-
)
42-
endif()
43-
44-
add_custom_command(OUTPUT lua.ico
45-
COMMAND magick ${CMAKE_CURRENT_LIST_DIR}/${LUA_LOGO} -resize 256x256 lua.ico
46-
MAIN_DEPENDENCY ${CMAKE_CURRENT_LIST_DIR}/${LUA_LOGO}
47-
COMMENT "Generating Lua icon"
48-
)
49-
add_custom_target(luaicon ALL DEPENDS lua.ico)
5036
endif()
5137

5238
set(LUA_SRC lua-${CMAKE_PROJECT_VERSION}/src)
@@ -128,19 +114,22 @@ endif()
128114

129115
install(TARGETS lua luac)
130116
install(TARGETS lualib FILE_SET include)
117+
install(FILES ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt TYPE DOC)
131118

132119
if(WIN32)
133-
set(CPACK_GENERATOR ZIP WIX)
134-
set(CPACK_WIX_UPGRADE_GUID "3e5a792d-9d31-41d5-a93f-629ab7c7683d")
135-
set(CPACK_WIX_PRODUCT_ICON lua.ico)
136-
list(APPEND CPACK_WIX_EXTENSIONS WixUtilExtension)
137-
list(APPEND CPACK_WIX_PATCH_FILE ${CMAKE_CURRENT_LIST_DIR}/WixPatch.xml)
120+
set(CPACK_GENERATOR ZIP)
121+
install(FILES
122+
${CMAKE_CURRENT_BINARY_DIR}/lua.pdb
123+
${CMAKE_CURRENT_BINARY_DIR}/luac.pdb
124+
${CMAKE_CURRENT_BINARY_DIR}/lua54.pdb
125+
DESTINATION bin)
138126
else()
139127
install(FILES ${LUA_DOC}/lua.1 ${LUA_DOC}/luac.1
140128
DESTINATION man/man1
141129
)
142130
endif()
143-
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt")
131+
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
132+
set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt)
144133
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CMAKE_PROJECT_NAME})
145134
set(CPACK_PACKAGE_VENDOR DEVCOM)
146135
include(CPack)

WixPatch.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)