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

remove unused cruft

Browse source
This commit is contained in:
Joey Hess 2012-12-09 12:59:34 -04:00
parent dea5599d3d
commit 8c082cda2e
2 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Build/OSXMkLibs.hs
View file

@ -29,12 +29,11 @@ import qualified Data.Set as S
type LibMap = M.Map FilePath String type LibMap = M.Map FilePath String
{- Recursively find and install libs, until nothing new to install is found. -} {- Recursively find and install libs, until nothing new to install is found. -}
mklibs :: FilePath -> [FilePath] -> LibMap -> IO [FilePath] mklibs :: FilePath -> [FilePath] -> LibMap -> IO ()
mklibs appbase libdirs libmap = do mklibs appbase libdirs libmap = do
(new, libmap') <- installLibs appbase libmap (new, libmap') <- installLibs appbase libmap
if null new unless null new $
then return (libdirs++new) mklibs appbase (libdirs++new) libmap'
else mklibs appbase (libdirs++new) libmap'
{- Returns directories into which new libs were installed. -} {- Returns directories into which new libs were installed. -}
installLibs :: FilePath -> LibMap -> IO ([FilePath], LibMap) installLibs :: FilePath -> LibMap -> IO ([FilePath], LibMap)
@ -115,7 +114,4 @@ main :: IO ()
main = getArgs >>= go main = getArgs >>= go
where where
go [] = error "specify OSXAPP_BASE" go [] = error "specify OSXAPP_BASE"
go (appbase:_) = do go (appbase:_) = mklibs appbase [] M.empty
libdirs <- mklibs appbase [] M.empty
writeFile (appbase </> "libdirs") $
unlines $ nub libdirs

18
standalone/osx/git-annex.app/Contents/MacOS/runshell
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Runs a shell command (or interactive shell) using the binaries and # Runs a shell command (or interactive shell) using the binaries
# libraries bundled with this app. # bundled with this app.
set -e set -e
@ -46,20 +46,6 @@ export ORIG_PATH
PATH=$base/bin:$PATH PATH=$base/bin:$PATH
export PATH export PATH
# This makes the linker first look in the library directories bundled
# in this app. Only if it fails to find a library there will a system
# library be used.
#
# This seems to work better than DYLD_LIBRARY_PATH, which can force
# the wrong version of a library to be used, if the app bundles two
# different versions of a single library. And it seems to work better
# than DYLD_FALLBACK_LIBRARY_PATH, which fails to override old system
# versions of libraries when a program in the app needs a newer version.
#ORIG_DYLD_ROOT_PATH="$DYLD_ROOT_PATH"
#export ORIG_DYLD_ROOT_PATH
#DYLD_ROOT_PATH=$base
#export DYLD_ROOT_PATH
ORIG_GIT_EXEC_PATH="$GIT_EXEC_PATH" ORIG_GIT_EXEC_PATH="$GIT_EXEC_PATH"
export ORIG_GIT_EXEC_PATH export ORIG_GIT_EXEC_PATH
GIT_EXEC_PATH=$base GIT_EXEC_PATH=$base