nsis 0.2 → 0.2.1
raw patch · 4 files changed
+11/−5 lines, 4 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
- Development.NSIS: License :: Page
+ Development.NSIS: License :: FilePath -> Page
Files
- Development/NSIS/Show.hs +7/−2
- Development/NSIS/Type.hs +2/−2
- Examples/Example1.hs +1/−0
- nsis.cabal +1/−1
Development/NSIS/Show.hs view
@@ -81,8 +81,8 @@ out (InstallIcon x) = ["!define MUI_ICON " ++ show x] out (UninstallIcon x) = ["!define MUI_UNICON " ++ show x] out (HeaderImage x) = "!define MUI_HEADERIMAGE" : ["!define MUI_HEADERIMAGE_BITMAP " ++ show x | Just x <- [x]]-out (Page x) = ["!insertmacro MUI_PAGE_" ++ map toUpper (show x)]-out (Unpage x) = ["!insertmacro MUI_UNPAGE_" ++ map toUpper (show x)]+out (Page x) = ["!insertmacro MUI_PAGE_" ++ showPage x]+out (Unpage x) = ["!insertmacro MUI_UNPAGE_" ++ showPage x] out Function{} = [] out (Delete ADelete{..}) = [unwords $ "Delete" : ["/rebootok"|delRebootOK] ++ [show delFile]] out (RMDir ARMDir{..}) = [unwords $ "RMDir" : ["/r"|rmRecursive] ++ ["/rebootok"|rmRebootOK] ++ [show rmDir]]@@ -91,6 +91,11 @@ out (Goto x) = ["Goto " ++ show x | x /= Label 0] out x = [show x]+++showPage :: Page -> String+showPage (License x) = "LICENSE \"" ++ x ++ "\""+showPage x = map toUpper $ show x indent x = " " ++ x
Development/NSIS/Type.hs view
@@ -228,12 +228,12 @@ data Page- = License+ = License FilePath | Components | Directory | InstFiles | Confirm- deriving (Show,Data,Typeable,Read,Bounded,Enum,Eq,Ord)+ deriving (Show,Data,Typeable,Read,Eq,Ord) data Level = None | User | Highest | Admin deriving (Show,Data,Typeable,Read,Bounded,Enum,Eq,Ord)
Examples/Example1.hs view
@@ -30,6 +30,7 @@ -- Pages page Directory+ page $ License "../neil/todo.txt" page InstFiles ---------------------------------
nsis.cabal view
@@ -1,7 +1,7 @@ cabal-version: >= 1.6 build-type: Simple name: nsis-version: 0.2+version: 0.2.1 -- license is GPL v2 only license: GPL license-file: LICENSE