diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ -# 0.1 [YYYY.MM.DD] - -* Initial commit. +### 0.1.1 [2016.11.09] +* Fix the build on non-Intel architectures (thanks, erikd!) + +## 0.1 [2016.09.15] + +* Initial commit. diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,30 +1,30 @@ -Copyright (c) 2016, Ryan Scott - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - * Neither the name of Ryan Scott nor the names of other - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Copyright (c) 2016, Ryan Scott + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Ryan Scott nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple -main = defaultMain +import Distribution.Simple +main = defaultMain diff --git a/code-page.cabal b/code-page.cabal --- a/code-page.cabal +++ b/code-page.cabal @@ -1,60 +1,60 @@ -name: code-page -version: 0.1 -synopsis: Windows code page library for Haskell -description: This library provides two modules: - . - * "System.IO.CodePage": a cross-platform module that exports - functions which adjust code pages on Windows, and do nothing - on other operating systems. - . - * "System.Win32.CodePage": On Windows, this exports functions - for getting, setting, and analyzing code pages. On other - operating systems, this module exports nothing. -homepage: https://github.com/RyanGlScott/code-page -bug-reports: https://github.com/RyanGlScott/code-page/issues -license: BSD3 -license-file: LICENSE -author: Ryan Scott -maintainer: Ryan Scott -stability: Provisional -copyright: (C) 2016 Ryan Scott -category: System -build-type: Simple -extra-source-files: CHANGELOG.md, README.md, include/*.h -cabal-version: >=1.10 -tested-with: GHC == 7.0.4 - , GHC == 7.2.2 - , GHC == 7.4.2 - , GHC == 7.6.3 - , GHC == 7.8.4 - , GHC == 7.10.3 - , GHC == 8.0.1 - -source-repository head - type: git - location: https://github.com/RyanGlScott/code-page - -library - exposed-modules: System.IO.CodePage - System.Win32.CodePage - build-depends: base >= 4.3 && < 5 - build-tools: hsc2hs - if os(windows) - cpp-options: "-DWINDOWS" - build-depends: Win32 - - hs-source-dirs: src - include-dirs: include - includes: windows_cconv.h - default-language: Haskell2010 - ghc-options: -Wall - -test-suite tests - type: exitcode-stdio-1.0 - main-is: Tests.hs - - build-depends: base >= 4.3 && < 5 - , code-page == 0.1 - - hs-source-dirs: tests - default-language: Haskell2010 +name: code-page +version: 0.1.1 +synopsis: Windows code page library for Haskell +description: This library provides two modules: + . + * "System.IO.CodePage": a cross-platform module that exports + functions which adjust code pages on Windows, and do nothing + on other operating systems. + . + * "System.Win32.CodePage": On Windows, this exports functions + for getting, setting, and analyzing code pages. On other + operating systems, this module exports nothing. +homepage: https://github.com/RyanGlScott/code-page +bug-reports: https://github.com/RyanGlScott/code-page/issues +license: BSD3 +license-file: LICENSE +author: Ryan Scott +maintainer: Ryan Scott +stability: Provisional +copyright: (C) 2016 Ryan Scott +category: System +build-type: Simple +extra-source-files: CHANGELOG.md, README.md, include/*.h +cabal-version: >=1.10 +tested-with: GHC == 7.0.4 + , GHC == 7.2.2 + , GHC == 7.4.2 + , GHC == 7.6.3 + , GHC == 7.8.4 + , GHC == 7.10.3 + , GHC == 8.0.1 + +source-repository head + type: git + location: https://github.com/RyanGlScott/code-page + +library + exposed-modules: System.IO.CodePage + System.Win32.CodePage + build-depends: base >= 4.3 && < 5 + build-tools: hsc2hs + if os(windows) + include-dirs: include + includes: windows_cconv.h + cpp-options: "-DWINDOWS" + build-depends: Win32 + + hs-source-dirs: src + default-language: Haskell2010 + ghc-options: -Wall + +test-suite tests + type: exitcode-stdio-1.0 + main-is: Tests.hs + + build-depends: base >= 4.3 && < 5 + , code-page == 0.1.1 + + hs-source-dirs: tests + default-language: Haskell2010