From 2d3c502948645d3d76b7d58e0a399b33fad99b89 Mon Sep 17 00:00:00 2001 From: chrox Date: Fri, 3 Oct 2014 18:02:50 +0800 Subject: [PATCH] move platform dependent files into 'platform' directory --- .gitmodules | 4 +-- Makefile | 29 ++++++++++-------- {android => platform/android}/llapp_main.lua | 0 {android => platform/android}/luajit-launcher | 0 .../kindle}/extensions/koreader/README.txt | 0 .../extensions/koreader/bin/koreader-ext.sh | 0 .../kindle}/extensions/koreader/config.xml | 0 .../kindle}/extensions/koreader/menu.json | 0 {kindle => platform/kindle}/koreader.sh | 0 {kindle => platform/kindle}/kotar_cpoint | 0 .../kindle}/launchpad/koreader.ini | 0 {kindle => platform/kindle}/libkohelper.sh | 0 {kobo => platform/kobo}/fmon/README.txt | 0 {kobo => platform/kobo}/fmon/koreader.sh | 0 {kobo => platform/kobo}/koreader.sh | 0 {kobo => platform/kobo}/nickel.sh | 0 {kobo => platform/kobo}/suspend.sh | 0 {windows => platform/win32}/SDL2.dll | Bin .../win32}/libgcc_s_sjlj-1.dll | Bin {windows => platform/win32}/libstdc++-6.dll | Bin .../win32}/libwinpthread-1.dll | Bin 21 files changed, 19 insertions(+), 14 deletions(-) rename {android => platform/android}/llapp_main.lua (100%) rename {android => platform/android}/luajit-launcher (100%) rename {kindle => platform/kindle}/extensions/koreader/README.txt (100%) rename {kindle => platform/kindle}/extensions/koreader/bin/koreader-ext.sh (100%) rename {kindle => platform/kindle}/extensions/koreader/config.xml (100%) rename {kindle => platform/kindle}/extensions/koreader/menu.json (100%) rename {kindle => platform/kindle}/koreader.sh (100%) rename {kindle => platform/kindle}/kotar_cpoint (100%) rename {kindle => platform/kindle}/launchpad/koreader.ini (100%) rename {kindle => platform/kindle}/libkohelper.sh (100%) rename {kobo => platform/kobo}/fmon/README.txt (100%) rename {kobo => platform/kobo}/fmon/koreader.sh (100%) rename {kobo => platform/kobo}/koreader.sh (100%) rename {kobo => platform/kobo}/nickel.sh (100%) rename {kobo => platform/kobo}/suspend.sh (100%) rename {windows => platform/win32}/SDL2.dll (100%) rename {windows => platform/win32}/libgcc_s_sjlj-1.dll (100%) rename {windows => platform/win32}/libstdc++-6.dll (100%) rename {windows => platform/win32}/libwinpthread-1.dll (100%) diff --git a/.gitmodules b/.gitmodules index 4000f8f41..fb096c5c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "koreader-base"] path = koreader-base url = git://github.com/koreader/koreader-base.git -[submodule "android/luajit-launcher"] - path = android/luajit-launcher +[submodule "platform/android/luajit-launcher"] + path = platform/android/luajit-launcher url = https://github.com/koreader/android-luajit-launcher.git diff --git a/Makefile b/Makefile index f82da93e9..16285ce6b 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,13 @@ export PATH:=$(CURDIR)/$(KOR_BASE)/toolchain/android-toolchain/bin:$(PATH) MACHINE?=$(shell PATH=$(PATH) $(CC) -dumpmachine 2>/dev/null) INSTALL_DIR=koreader-$(MACHINE) -ANDROID_DIR=android +# platform directories +PLATFORM_DIR=platform +KINDLE_DIR=$(PLATFORM_DIR)/kindle +KOBO_DIR=$(PLATFORM_DIR)/kobo +ANDROID_DIR=$(PLATFORM_DIR)/android ANDROID_LAUNCHER_DIR:=$(ANDROID_DIR)/luajit-launcher +WIN32_DIR=$(PLATFORM_DIR)/win32 # files to link from main directory INSTALL_FILES=reader.lua frontend resources defaults.lua l10n \ @@ -54,7 +59,7 @@ ifdef ANDROID endif ifdef WIN32 # install runtime libraries for win32 - cd $(INSTALL_DIR)/koreader && cp ../../windows/*.dll . + cd $(INSTALL_DIR)/koreader && cp ../../$(WIN32_DIR)/*.dll . endif # install plugins cp -r plugins/* $(INSTALL_DIR)/koreader/plugins/ @@ -102,11 +107,11 @@ kindleupdate: all # remove old package if any rm -f koreader-kindle-$(MACHINE)-$(VERSION).zip # Kindle launching scripts - ln -sf ../kindle/extensions $(INSTALL_DIR)/ - ln -sf ../kindle/launchpad $(INSTALL_DIR)/ - ln -sf ../../kindle/koreader.sh $(INSTALL_DIR)/koreader - ln -sf ../../kindle/libkohelper.sh $(INSTALL_DIR)/koreader - ln -sf ../../kindle/kotar_cpoint $(INSTALL_DIR)/koreader + ln -sf ../$(KINDLE_DIR)/extensions $(INSTALL_DIR)/ + ln -sf ../$(KINDLE_DIR)/launchpad $(INSTALL_DIR)/ + ln -sf ../../$(KINDLE_DIR)/koreader.sh $(INSTALL_DIR)/koreader + ln -sf ../../$(KINDLE_DIR)/libkohelper.sh $(INSTALL_DIR)/koreader + ln -sf ../../$(KINDLE_DIR)/kotar_cpoint $(INSTALL_DIR)/koreader # create new package # Don't bundle launchpad on touch devices.. ifeq ($(TARGET), kindle-legacy) @@ -137,13 +142,13 @@ koboupdate: all rm -f koreader-kobo-$(MACHINE)-$(VERSION).zip # Kobo launching scripts mkdir -p $(INSTALL_DIR)/kobo/mnt/onboard/.kobo - ln -sf ../../../../../kobo/fmon $(INSTALL_DIR)/kobo/mnt/onboard/.kobo/ + ln -sf ../../../../../$(KOBO_DIR)/fmon $(INSTALL_DIR)/kobo/mnt/onboard/.kobo/ cd $(INSTALL_DIR)/kobo && tar -czhf ../KoboRoot.tgz mnt cp resources/koreader.png $(INSTALL_DIR)/koreader.png - cp kobo/fmon/README.txt $(INSTALL_DIR)/README_kobo.txt - cp kobo/koreader.sh $(INSTALL_DIR)/koreader - cp kobo/suspend.sh $(INSTALL_DIR)/koreader - cp kobo/nickel.sh $(INSTALL_DIR)/koreader + cp $(KOBO_DIR)/fmon/README.txt $(INSTALL_DIR)/README_kobo.txt + cp $(KOBO_DIR)/koreader.sh $(INSTALL_DIR)/koreader + cp $(KOBO_DIR)/suspend.sh $(INSTALL_DIR)/koreader + cp $(KOBO_DIR)/nickel.sh $(INSTALL_DIR)/koreader # create new package cd $(INSTALL_DIR) && \ zip -9 -r \ diff --git a/android/llapp_main.lua b/platform/android/llapp_main.lua similarity index 100% rename from android/llapp_main.lua rename to platform/android/llapp_main.lua diff --git a/android/luajit-launcher b/platform/android/luajit-launcher similarity index 100% rename from android/luajit-launcher rename to platform/android/luajit-launcher diff --git a/kindle/extensions/koreader/README.txt b/platform/kindle/extensions/koreader/README.txt similarity index 100% rename from kindle/extensions/koreader/README.txt rename to platform/kindle/extensions/koreader/README.txt diff --git a/kindle/extensions/koreader/bin/koreader-ext.sh b/platform/kindle/extensions/koreader/bin/koreader-ext.sh similarity index 100% rename from kindle/extensions/koreader/bin/koreader-ext.sh rename to platform/kindle/extensions/koreader/bin/koreader-ext.sh diff --git a/kindle/extensions/koreader/config.xml b/platform/kindle/extensions/koreader/config.xml similarity index 100% rename from kindle/extensions/koreader/config.xml rename to platform/kindle/extensions/koreader/config.xml diff --git a/kindle/extensions/koreader/menu.json b/platform/kindle/extensions/koreader/menu.json similarity index 100% rename from kindle/extensions/koreader/menu.json rename to platform/kindle/extensions/koreader/menu.json diff --git a/kindle/koreader.sh b/platform/kindle/koreader.sh similarity index 100% rename from kindle/koreader.sh rename to platform/kindle/koreader.sh diff --git a/kindle/kotar_cpoint b/platform/kindle/kotar_cpoint similarity index 100% rename from kindle/kotar_cpoint rename to platform/kindle/kotar_cpoint diff --git a/kindle/launchpad/koreader.ini b/platform/kindle/launchpad/koreader.ini similarity index 100% rename from kindle/launchpad/koreader.ini rename to platform/kindle/launchpad/koreader.ini diff --git a/kindle/libkohelper.sh b/platform/kindle/libkohelper.sh similarity index 100% rename from kindle/libkohelper.sh rename to platform/kindle/libkohelper.sh diff --git a/kobo/fmon/README.txt b/platform/kobo/fmon/README.txt similarity index 100% rename from kobo/fmon/README.txt rename to platform/kobo/fmon/README.txt diff --git a/kobo/fmon/koreader.sh b/platform/kobo/fmon/koreader.sh similarity index 100% rename from kobo/fmon/koreader.sh rename to platform/kobo/fmon/koreader.sh diff --git a/kobo/koreader.sh b/platform/kobo/koreader.sh similarity index 100% rename from kobo/koreader.sh rename to platform/kobo/koreader.sh diff --git a/kobo/nickel.sh b/platform/kobo/nickel.sh similarity index 100% rename from kobo/nickel.sh rename to platform/kobo/nickel.sh diff --git a/kobo/suspend.sh b/platform/kobo/suspend.sh similarity index 100% rename from kobo/suspend.sh rename to platform/kobo/suspend.sh diff --git a/windows/SDL2.dll b/platform/win32/SDL2.dll similarity index 100% rename from windows/SDL2.dll rename to platform/win32/SDL2.dll diff --git a/windows/libgcc_s_sjlj-1.dll b/platform/win32/libgcc_s_sjlj-1.dll similarity index 100% rename from windows/libgcc_s_sjlj-1.dll rename to platform/win32/libgcc_s_sjlj-1.dll diff --git a/windows/libstdc++-6.dll b/platform/win32/libstdc++-6.dll similarity index 100% rename from windows/libstdc++-6.dll rename to platform/win32/libstdc++-6.dll diff --git a/windows/libwinpthread-1.dll b/platform/win32/libwinpthread-1.dll similarity index 100% rename from windows/libwinpthread-1.dll rename to platform/win32/libwinpthread-1.dll