kit 0.6.6 → 0.6.7

raw patch · 5 files changed

+9/−7 lines, 5 files

Files

• Kit/CmdArgs.hs +2/−2
• Kit/Main.hs +2/−2
• Kit/Project.hs +3/−2
• Kit/Util/FSAction.hs +1/−0
• kit.cabal +1/−1

@@ -4,7 +4,7 @@   import System.Console.CmdArgs as CA    appVersion :: String-  appVersion = "0.6.6" -- TODO how to keep this up to date with kit.cabal?+  appVersion = "0.6.7" -- TODO how to keep this up to date with kit.cabal?    data KitCmdArgs = Update                   | Package@@ -29,5 +29,5 @@     ]    parseArgs :: IO KitCmdArgs-  parseArgs = cmdArgs $ parseMode &= program "kit" &= summary ("Kit v" ++ appVersion ++ ". It's a dependency manager for Objective-C projects built with Xcode.")+  parseArgs = cmdArgs $ parseMode &= program "kit" &= summary ("Kit " ++ appVersion) 

@@ -66,9 +66,9 @@           cleanOrCreate kitVerifyDir           inDirectory kitVerifyDir $ do             writeSpec "KitSpec" (defaultSpec "verify-kit" "1.0") { specDependencies = [specKit spec] }-            doUpdate+            liftIO $ runCommand doUpdate               inDirectory "Kits" $ do-              liftIO $ system "open KitDeps.xcodeproj"+              liftIO $ system "open ."               liftIO $ system $ "xcodebuild -sdk " ++ sdk           puts "OK."         puts "End checks."

@@ -59,8 +59,9 @@   runAction $ FileCreate xcodeConfigFile $ kitProjectConfig kp   runAction $ FileCreate kitUpdateMakeFilePath kitUpdateMakeFile   runAction $ FileCreate depsConfigFile $ kitProjectDepsConfig kp-  puts $ " -> Linking resources: " ++ stringJoin ", " (map fst $ kitProjectResourceDirs kp)-  mapM_ (\(tgt,name) -> runAction $ Symlink tgt name) $ kitProjectResourceDirs kp+  when (not . null . kitProjectResourceDirs $ kp) $ do+    puts $ " -> Linking resources: " ++ stringJoin ", " (map fst $ kitProjectResourceDirs kp)+    mapM_ (\(tgt,name) -> runAction $ Symlink tgt name) $ kitProjectResourceDirs kp  generateKitProjectFromSpecs :: [KitSpec] -> Maybe String -> KitIO () generateKitProjectFromSpecs specs depsOnlyConfig = do

@@ -24,6 +24,7 @@   -- When a `name` has parent directories, symbolic link target needs to be made relative to that file   -- need to consider "./name"   let relFix = join $ intersperse "/" $ map (const "..") (init $ splitDirectories name)+  mkdirP $ dropFileName name   catch (when' (fileExist target) $ createSymbolicLink (relFix </> target) name) $ \e -> do     error $ "An error occured when creating a symlink to " ++ target ++ " called " ++ name ++ ": " ++ show e 

@@ -1,5 +1,5 @@ name:           kit-version:        0.6.6+version:        0.6.7 cabal-version:  >=1.2 build-type:     Simple license:        BSD3