Changeset 7447 for src/Pugs.hs

Timestamp:

10/08/05 21:00:13 (3 years ago)

Author:

iblech

Message:

* util/PugsConfig.pm: Very minor comment fix.
* src/Pugs/Run.hs: Include $pugslibdir/perl6 in the default @*INC.
* src/Pugs.hs: Find jspugs.pl, runjs.pl, and pugs-p5.pl even if $sourcedir

had been deleted and thus $pugslibdir has to be used.
The patch is a bit hacky (for example, pugs-p5.pl is searched for in --
amongst other dirs -- PIL2JS), but seems reasonable given that the directory
structure of $sourcedir doesn't match the one of $pugslibdir.
Note: PIL-Run still can't be run from $pugslibdir.
Note: pugs::hack is not yet updated WRT the recent dir moves.

Files:

• src/Pugs.hs (modified) (3 diffs)

src/Pugs.hs

@@ -232 +232 @@
     case map toLower backend of
         "js"    -> if (args' == [])
-                   then (doExecuteHelper [ "perl5", "PIL2JS",  "jspugs.pl"  ] args)
-                   else (doExecuteHelper [ "perl5", "PIL2JS",  "runjs.pl"   ] args)
-        "perl5" ->       doExecuteHelper [ "perl5", "PIL-Run", "pugs-p5.pl" ] args
+                   then (doExecuteHelper "jspugs.pl"  args)
+                   else (doExecuteHelper "runjs.pl"   args)
+        "perl5" ->       doExecuteHelper "pugs-p5.pl" args
         _       ->       fail ("unknown backend: " ++ backend)
     where
@@ -244 +244 @@
     f (x:xs) = x:f xs
 
-doExecuteHelper :: [FilePath] -> [String] -> IO ()
+doExecuteHelper :: FilePath -> [String] -> IO ()
 doExecuteHelper helper args = do
-    let searchPaths = [["."], ["..", ".."], [getConfig "installsitelib"], [getConfig "sourcedir"]]
+    let searchPaths = concatMap (\x -> map (x++) suffixes) [["."], ["..", ".."], [getConfig "sourcedir"], [getConfig "pugslibdir"]]
     mbin <- findHelper searchPaths
     case mbin of
         Just binary -> do
             exitWith =<< executeFile' perl5 True (binary:args) Nothing
-        _ -> fail ("Couldn't find helper program " ++ (foldl1 joinFileName helper) ++ " (searched in " ++ show searchPaths ++ ")")
-    where
+        _ -> fail ("Couldn't find helper program " ++ helper ++ " (searched in " ++ show (map (foldl1 joinFileName) searchPaths) ++ ")")
+    where
+    suffixes =
+        [ []
+        , ["perl5", "PIL2JS"]      --  $sourcedir/perl5/PIL2JS/jspugs.pl
+        , ["perl5", "PIL-Run"]     --  $sourcedir/perl5/PIL-Run/pugs-p5.pl
+        , ["perl5", "lib"]         --  $pugslibdir/perl5/lib/jspugs.pl
+        , ["perl5", "lib", "PIL"]  --  $pugslibdir/perl5/PIL/pugs-p5.pl
+        ]
     perl5 = getConfig "perl5path"
     findHelper :: [[FilePath]] -> IO (Maybe FilePath)
@@ -270 +277 @@
                 | filex'    -> return $ Just $ file' x
                 | otherwise -> findHelper xs
-    file  x = foldl1 joinFileName (x ++ helper)
+    file  x = foldl1 joinFileName (x ++ [helper])
     file' x = (file x) ++ (getConfig "exe_ext")
     fileExists path = do