renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make: simplify symlink installs

Browse Source 
Since we mandate coreutils on macOS too, we can simplify calls to `ln`.
This commit is contained in:
Benoit Pierre
2024-07-31 01:55:32 +02:00
committed by Frans de Jonge
parent d9e4376e35
commit d83647d76e
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@@ -72,19 +72,19 @@ else
bash -O extglob -c '$(SYMLINK) $(OUTPUT_DIR_ARTIFACTS) $(INSTALL_DIR)/koreader/'
ifneq (,$(EMULATE_READER))
@echo "[*] install front spec only for the emulator"
$(SYMLINK) $(abspath spec) $(INSTALL_DIR)/koreader/spec/front
$(SYMLINK) $(abspath test) $(INSTALL_DIR)/koreader/spec/front/unit/data
$(SYMLINK) spec $(INSTALL_DIR)/koreader/spec/front
$(SYMLINK) test $(INSTALL_DIR)/koreader/spec/front/unit/data
endif
endif
$(SYMLINK) $(abspath $(INSTALL_FILES)) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(INSTALL_FILES) $(INSTALL_DIR)/koreader/
ifdef ANDROID
$(SYMLINK) $(abspath $(ANDROID_DIR)/*.lua) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(ANDROID_DIR)/*.lua $(INSTALL_DIR)/koreader/
endif
@echo "[*] Install update once marker"
@echo "# This file indicates that update once patches have not been applied yet." > $(INSTALL_DIR)/koreader/update_once.marker
ifdef WIN32
@echo "[*] Install runtime libraries for win32..."
$(SYMLINK) $(abspath $(WIN32_DIR)/*.dll) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(WIN32_DIR)/*.dll $(INSTALL_DIR)/koreader/
endif
ifdef SHIP_SHARED_STL
@echo "[*] Install C++ runtime..."
@@ -93,9 +93,9 @@ ifdef SHIP_SHARED_STL
$(STRIP) --strip-unneeded $(INSTALL_DIR)/koreader/libs/$(notdir $(SHARED_STL_LIB))
endif
@echo "[*] Install plugins"
$(SYMLINK) $(abspath plugins) $(INSTALL_DIR)/koreader/
$(SYMLINK) plugins $(INSTALL_DIR)/koreader/
@echo "[*] Install resources"
$(SYMLINK) $(abspath resources/fonts/*) $(INSTALL_DIR)/koreader/fonts/
$(SYMLINK) resources/fonts/* $(INSTALL_DIR)/koreader/fonts/
install -d $(INSTALL_DIR)/koreader/{screenshots,data/{dict,tessdata},fonts/host,ota}
ifeq ($(IS_RELEASE),1)
@echo "[*] Clean up, remove unused files for releases"
@@ -106,10 +106,10 @@ base:
$(MAKE) -C $(KOR_BASE)
$(INSTALL_DIR)/koreader/.busted: .busted
$(SYMLINK) $(abspath .busted) $@
$(SYMLINK) .busted $@
$(INSTALL_DIR)/koreader/.luacov:
$(SYMLINK) $(abspath .luacov) $@
$(SYMLINK) .luacov $@
testfront: $(INSTALL_DIR)/koreader/.busted
# sdr files may have unexpected impact on unit testing

2
base

Submodule base updated: d8c6071687...aade35b80f

6
make/appimage.mk
View File

@@ -6,9 +6,9 @@ APPIMAGETOOL_URL = https://github.com/AppImage/AppImageKit/releases/download/13/
update: all
# remove old package if any
rm -f koreader-appimage-$(MACHINE)-$(VERSION).appimage
$(SYMLINK) $(abspath $(APPIMAGE_DIR)/AppRun) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(abspath $(APPIMAGE_DIR)/koreader.desktop) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(abspath resources/koreader.png) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(APPIMAGE_DIR)/AppRun $(INSTALL_DIR)/koreader/
$(SYMLINK) $(APPIMAGE_DIR)/koreader.desktop $(INSTALL_DIR)/koreader/
$(SYMLINK) resources/koreader.png $(INSTALL_DIR)/koreader/
sed -e 's/%%VERSION%%/$(VERSION)/' -e 's/%%DATE%%/$(RELEASE_DATE)/' $(PLATFORM_DIR)/common/koreader.metainfo.xml >$(INSTALL_DIR)/koreader/koreader.appdata.xml
# TODO at best this is DebUbuntu specific
$(SYMLINK) /usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0 $(INSTALL_DIR)/koreader/libs/libSDL2.so

14
make/kindle.mk
View File

@@ -14,13 +14,13 @@ update: all
# remove old package if any
rm -f $(KINDLE_PACKAGE)
# Kindle launching scripts
$(SYMLINK) $(abspath $(KINDLE_DIR)/extensions) $(INSTALL_DIR)/
$(SYMLINK) $(abspath $(KINDLE_DIR)/launchpad) $(INSTALL_DIR)/
$(SYMLINK) $(abspath $(KINDLE_DIR)/koreader.sh) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(abspath $(KINDLE_DIR)/libkohelper.sh) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(abspath $(KINDLE_DIR)/libkohelper.sh) $(INSTALL_DIR)/extensions/koreader/bin/
$(SYMLINK) $(abspath $(COMMON_DIR)/spinning_zsync) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(abspath $(KINDLE_DIR)/wmctrl) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(KINDLE_DIR)/extensions $(INSTALL_DIR)/
$(SYMLINK) $(KINDLE_DIR)/launchpad $(INSTALL_DIR)/
$(SYMLINK) $(KINDLE_DIR)/koreader.sh $(INSTALL_DIR)/koreader/
$(SYMLINK) $(KINDLE_DIR)/libkohelper.sh $(INSTALL_DIR)/koreader/
$(SYMLINK) $(KINDLE_DIR)/libkohelper.sh $(INSTALL_DIR)/extensions/koreader/bin/
$(SYMLINK) $(COMMON_DIR)/spinning_zsync $(INSTALL_DIR)/koreader/
$(SYMLINK) $(KINDLE_DIR)/wmctrl $(INSTALL_DIR)/koreader/
# create new package
cd $(INSTALL_DIR) && pwd && \
zip -9 -r \

14
make/ubuntu-touch.mk
View File

@@ -6,13 +6,13 @@ update: all
file $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
# remove old package if any
rm -f koreader-ubuntu-touch-$(MACHINE)-$(VERSION).click
$(SYMLINK) $(abspath $(UBUNTUTOUCH_DIR)/koreader.sh) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(abspath $(UBUNTUTOUCH_DIR)/manifest.json) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(abspath $(UBUNTUTOUCH_DIR)/koreader.apparmor) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(abspath $(UBUNTUTOUCH_DIR)/koreader.apparmor.openstore) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(abspath $(UBUNTUTOUCH_DIR)/koreader.desktop) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(abspath $(UBUNTUTOUCH_DIR)/koreader.png) $(INSTALL_DIR)/koreader/
$(SYMLINK) $(abspath $(UBUNTUTOUCH_DIR)/libSDL2.so) $(INSTALL_DIR)/koreader/libs/
$(SYMLINK) $(UBUNTUTOUCH_DIR)/koreader.sh $(INSTALL_DIR)/koreader/
$(SYMLINK) $(UBUNTUTOUCH_DIR)/manifest.json $(INSTALL_DIR)/koreader/
$(SYMLINK) $(UBUNTUTOUCH_DIR)/koreader.apparmor $(INSTALL_DIR)/koreader/
$(SYMLINK) $(UBUNTUTOUCH_DIR)/koreader.apparmor.openstore $(INSTALL_DIR)/koreader/
$(SYMLINK) $(UBUNTUTOUCH_DIR)/koreader.desktop $(INSTALL_DIR)/koreader/
$(SYMLINK) $(UBUNTUTOUCH_DIR)/koreader.png $(INSTALL_DIR)/koreader/
$(SYMLINK) $(UBUNTUTOUCH_DIR)/libSDL2.so $(INSTALL_DIR)/koreader/libs/
# create new package
cd $(INSTALL_DIR) && pwd && \
zip -9 -r \