7c094e0 · typeable/yaml

libyaml/LICENSEnew file+19

compare with master

unifiedsplit

@@ -0,0 +1,19 @@

2+

3+Permission is hereby granted, free of charge, to any person obtaining a copy of

4+this software and associated documentation files (the "Software"), to deal in

5+the Software without restriction, including without limitation the rights to

6+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

7+of the Software, and to permit persons to whom the Software is furnished to do

8+so, subject to the following conditions:

9+

10+The above copyright notice and this permission notice shall be included in all

11+copies or substantial portions of the Software.

12+

13+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

14+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

15+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

16+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

17+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

18+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

19+SOFTWARE.

c/api.c → libyaml/api.crenamed

The content is the same.

c/dumper.c → libyaml/dumper.crenamed

The content is the same.

c/emitter.c → libyaml/emitter.crenamed

The content is the same.

c/loader.c → libyaml/loader.crenamed

The content is the same.

c/parser.c → libyaml/parser.crenamed

The content is the same.

c/reader.c → libyaml/reader.crenamed

The content is the same.

c/scanner.c → libyaml/scanner.crenamed

The content is the same.

c/writer.c → libyaml/writer.crenamed

The content is the same.

c/yaml.h → libyaml/yaml.hrenamed

The content is the same.

c/yaml_private.h → libyaml/yaml_private.hrenamed

The content is the same.

yaml.cabal+38−22

@@ -2,18 +2,26 @@ name: yaml

2version: 0.4.1

3license: BSD3

4license-file: LICENSE

5−author: Michael Snoyman <michael@snoyman.com>, Anton Ageev <antage@gmail.com>

5+author: Michael Snoyman <michael@snoyman.com>, Anton Ageev <antage@gmail.com>,Kirill Simonov

6maintainer: Michael Snoyman <michael@snoyman.com>

7synopsis: Low-level binding to the libyaml C library.

8−description: Provides support for parsing and emitting Yaml documents. Includes the full C library in the package so you don't need to worry about any non-Haskell dependencies.

8+description: Provides support for parsing and emitting Yaml documents.

9+ .

10+ This package includes the full libyaml C library version 0.1.12 by Kirill

11+ Simonov (<http://pyyaml.org/wiki/LibYAML>) in the package so you

12+ don't need to worry about any non-Haskell dependencies.

9category: Web

13category: Web

10stability: unstable

14stability: unstable

11cabal-version: >= 1.2

15cabal-version: >= 1.2

12build-type: Simple

16build-type: Simple

13homepage: http://github.com/snoyberg/yaml/

17homepage: http://github.com/snoyberg/yaml/

14extra-source-files: c/helper.h,

18extra-source-files: c/helper.h,

15− c/yaml_private.h,

19+ libyaml/yaml_private.h,

16− c/yaml.h

20+ libyaml/yaml.h,

21+ libyaml/LICENSE

22+

23+flag system-libyaml

24+ description: Use the system-wide libyaml instead of the bundled copy

17

25

18flag nolib

26flag nolib

19 description: Skip building the library

27 description: Skip building the library

@@ -33,16 +41,20 @@ library

33 , enumerator >= 0.4 && < 0.5

41 , enumerator >= 0.4 && < 0.5

34 exposed-modules: Text.Libyaml

42 exposed-modules: Text.Libyaml

35 ghc-options: -Wall

43 ghc-options: -Wall

36− c-sources: c/helper.c,

44+ c-sources: c/helper.c

37− c/api.c,

38− c/dumper.c,

39− c/emitter.c,

40− c/loader.c,

41− c/parser.c,

42− c/reader.c,

43− c/scanner.c,

44− c/writer.c

45 include-dirs: c

46+ if flag(system-libyaml)

47+ pkgconfig-depends: yaml-0.1

48+ else

49+ c-sources: libyaml/api.c,

50+ libyaml/dumper.c,

51+ libyaml/emitter.c,

52+ libyaml/loader.c,

53+ libyaml/parser.c,

54+ libyaml/reader.c,

55+ libyaml/scanner.c,

56+ libyaml/writer.c

57+ include-dirs: libyaml

46

58

47executable runtests

59executable runtests

48 if flag(buildtests)

60 if flag(buildtests)

@@ -60,14 +72,18 @@ executable runtests

60 else

72 else

61 Buildable: False

73 Buildable: False

62 ghc-options: -Wall

74 ghc-options: -Wall

63− c-sources: c/helper.c,

75+ c-sources: c/helper.c

64− c/api.c,

65− c/dumper.c,

66− c/emitter.c,

67− c/loader.c,

68− c/parser.c,

69− c/reader.c,

70− c/scanner.c,

71− c/writer.c

72 include-dirs: c

76 include-dirs: c

77+ if flag(system-libyaml)

78+ pkgconfig-depends: yaml-0.1

79+ else

80+ c-sources: libyaml/api.c,

81+ libyaml/dumper.c,

82+ libyaml/emitter.c,

83+ libyaml/loader.c,

84+ libyaml/parser.c,

85+ libyaml/reader.c,

86+ libyaml/scanner.c,

87+ libyaml/writer.c

88+ include-dirs: libyaml

73 main-is: runtests.hs

89 main-is: runtests.hs