From 62344d13250a9d42052f527db6e09ffae166fad5 Mon Sep 17 00:00:00 2001 From: Krasimir Angelov Date: Tue, 16 Aug 2022 21:03:44 +0200 Subject: [PATCH] manually copy the logo to the www directory. Copying in Setup.hs doesn't work with the new Cabal --- src/compiler/Setup.hs | 8 -------- src/compiler/gf.cabal | 1 + src/compiler/www/Logos/gf0.png | Bin 0 -> 6442 bytes 3 files changed, 1 insertion(+), 8 deletions(-) create mode 100644 src/compiler/www/Logos/gf0.png diff --git a/src/compiler/Setup.hs b/src/compiler/Setup.hs index 96189941a..938563802 100644 --- a/src/compiler/Setup.hs +++ b/src/compiler/Setup.hs @@ -170,11 +170,9 @@ setupWeb dest (pkg,lbi) = do if contrib_exists then mapM_ copy_pgf example_grammars else return () -- message already displayed from buildWeb - copyGFLogo where grammars_dir = www_dir "grammars" cloud_dir = www_dir "tmp" -- hmm - logo_dir = www_dir "Logos" www_dir = datadir (absoluteInstallDirs pkg lbi dest) "www" gfo_dir = buildDir lbi "examples" @@ -187,12 +185,6 @@ setupWeb dest (pkg,lbi) = do copyFile src dst else putStrLn $ "Not installing "++dst - gf_logo = "gf0.png" - - copyGFLogo = - do createDirectoryIfMissing True logo_dir - copyFile ("..""..""doc""Logos"gf_logo) (logo_dirgf_logo) - -- | Run an arbitrary system command, returning False on failure execute :: String -> [String] -> IO Bool execute command args = diff --git a/src/compiler/gf.cabal b/src/compiler/gf.cabal index bdfdfbb85..78573eb1a 100644 --- a/src/compiler/gf.cabal +++ b/src/compiler/gf.cabal @@ -16,6 +16,7 @@ tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4, GHC==9.0.2 data-files: www/*.html www/*.css + www/Logos/gf0.png www/P/*.png www/gfse/*.html www/gfse/*.css diff --git a/src/compiler/www/Logos/gf0.png b/src/compiler/www/Logos/gf0.png new file mode 100644 index 0000000000000000000000000000000000000000..ffbe7a4496aeed222f7839d20816496233abe7b1 GIT binary patch literal 6442 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 literal 0 HcmV?d00001