mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

ensure that Android TH splice is expanded in native side of build

Browse source
This commit is contained in:
Joey Hess 2013-11-25 13:01:53 -04:00
parent 27bb1be7f1
commit 5163d5fb39
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assistant/WebApp/Configurators/Upgrade.hs
View file

@ -23,7 +23,7 @@ import Config
- -} - -}
getConfigStartUpgradeR :: GitAnnexDistribution -> Handler Html getConfigStartUpgradeR :: GitAnnexDistribution -> Handler Html
getConfigStartUpgradeR d = do getConfigStartUpgradeR d = do
#ifdef __ANDROID__ #ifdef ANDROID_SPLICES
let url = distributionUrl d let url = distributionUrl d
page "Upgrade" (Just Configuration) $ page "Upgrade" (Just Configuration) $
$(widgetFile "configurators/upgrade/android") $(widgetFile "configurators/upgrade/android")

2
Makefile
View file

@ -173,7 +173,7 @@ ANDROID_FLAGS?=-f-XMPP
# Uses https://github.com/neurocyte/ghc-android # Uses https://github.com/neurocyte/ghc-android
android: Build/EvilSplicer android: Build/EvilSplicer
echo "Running native build, to get TH splices.." echo "Running native build, to get TH splices.."
if [ ! -e dist/setup/setup ]; then $(CABAL) configure -f-Production -O0 $(ANDROID_FLAGS); fi if [ ! -e dist/setup/setup ]; then $(CABAL) configure -f-Production -O0 $(ANDROID_FLAGS) -fAndroidSplice; fi
mkdir -p tmp mkdir -p tmp
if ! $(CABAL) build --ghc-options=-ddump-splices 2> tmp/dump-splices; then tail tmp/dump-splices >&2; exit 1; fi if ! $(CABAL) build --ghc-options=-ddump-splices 2> tmp/dump-splices; then tail tmp/dump-splices >&2; exit 1; fi
echo "Setting up Android build tree.." echo "Setting up Android build tree.."

10
git-annex.cabal
View file

@ -56,7 +56,11 @@ Flag Production
Description: Enable production build (slower build; faster binary) Description: Enable production build (slower build; faster binary)
Flag Android Flag Android
Description: Building for Android Description: Cross building for Android
Default: False
Flag AndroidSplice
Description: Building to get TH splices for Android
Default: False Default: False
Flag TestSuite Flag TestSuite
@ -155,7 +159,9 @@ Executable git-annex
if flag(Android) if flag(Android)
Build-Depends: data-endian Build-Depends: data-endian
CPP-Options: -D__ANDROID__ CPP-Options: -D__ANDROID__ -DANDROID_SPLICES
if flag(AndroidSplices)
CPP-Options: -DANDROID_SPLICES
if flag(Webapp) && (! os(windows)) if flag(Webapp) && (! os(windows))
Build-Depends: Build-Depends: