summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile42
-rw-r--r--libcmark-gfm-extensions/manifest2
-rw-r--r--libcmark-gfm/libcmark-gfm/buildfile9
-rw-r--r--libcmark-gfm/manifest2
4 files changed, 24 insertions, 31 deletions
diff --git a/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile b/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile
index 5229fd9..6f57397 100644
--- a/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile
+++ b/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile
@@ -6,41 +6,39 @@ import int_libs = libcmark-gfm%lib{cmark-gfm}
lib{cmark-gfm-extensions}: {h c}{**} $int_libs
-windows = ($c.target.class == 'windows')
-
-gcc = ($c.class == 'gcc')
-msvc = ($c.class == 'msvc')
-
# Build options.
#
obja{*}: c.poptions += -DCMARK_GFM_EXTENSIONS_STATIC_BUILD
objs{*}: c.poptions += -DCMARK_GFM_EXTENSIONS_SHARED_BUILD
-if! $windows
+if ($c.target.class != 'windows')
c.coptions += -fvisibility=hidden
else
c.poptions += -DWIN32 -D_WINDOWS
c.poptions =+ "-I$src_base" "-I$src_base/extensions"
-if $msvc
-{
- # Disable warnings that pop up with /W3.
- #
- c.coptions += /wd4311
-}
-elif $gcc
+switch $c.class
{
- c.coptions += -pedantic
+ case 'gcc'
+ {
+ c.coptions += -pedantic
- # Disable warnings that pop up with -Wextra. Upstream doesn't seem to care
- # about these and it is not easy to disable specific warnings in a way that
- # works across compilers/version (some -Wno-* options are only recognized in
- # newer versions). There are still some warnings left that appear for
- # certain platforms/compilers. We pass them through but disable treating
- # them as errors.
- #
- c.coptions += -Wno-extra -Wno-error
+ # Disable warnings that pop up with -Wextra. Upstream doesn't seem to care
+ # about these and it is not easy to disable specific warnings in a way
+ # that works across compilers/version (some -Wno-* options are only
+ # recognized in newer versions). There are still some warnings left that
+ # appear for certain platforms/compilers. We pass them through but disable
+ # treating them as errors.
+ #
+ c.coptions += -Wno-extra -Wno-error
+ }
+ case 'msvc'
+ {
+ # Disable warnings that pop up with /W3.
+ #
+ c.coptions += /wd4311
+ }
}
# Export options.
diff --git a/libcmark-gfm-extensions/manifest b/libcmark-gfm-extensions/manifest
index 1998d69..e888a4f 100644
--- a/libcmark-gfm-extensions/manifest
+++ b/libcmark-gfm-extensions/manifest
@@ -3,7 +3,7 @@ name: libcmark-gfm-extensions
# Note: remember to update build/bootstrap.build!
#
-version: 0.29.0-a.1+4
+version: 0.29.0-a.1+5
upstream-version: 0.29.0.gfm.0
project: cmark-gfm
diff --git a/libcmark-gfm/libcmark-gfm/buildfile b/libcmark-gfm/libcmark-gfm/buildfile
index 0d80f53..ec95650 100644
--- a/libcmark-gfm/libcmark-gfm/buildfile
+++ b/libcmark-gfm/libcmark-gfm/buildfile
@@ -9,16 +9,11 @@ lib{cmark-gfm}: {h }{* -version} \
{h }{ version} \
src/{h inc c}{* -main}
-windows = ($c.target.class == 'windows')
-
-gcc = ($c.class == 'gcc')
-
# No need to include the generated version header into the distribution since
# it is installed under a different name and so the correct one will always
# be picked up.
#
h{version}: src/in{cmark-gfm_version} $src_root/manifest
-h{version}:
{
in.symbol = '@'
@@ -33,7 +28,7 @@ h{version}:
obja{*}: c.poptions += -DCMARK_GFM_STATIC_BUILD
objs{*}: c.poptions += -DCMARK_GFM_SHARED_BUILD
-if! $windows
+if ($c.target.class != 'windows')
c.coptions += -fvisibility=hidden
else
c.poptions += -DWIN32 -D_WINDOWS
@@ -43,7 +38,7 @@ else
#
c.poptions =+ "-I$out_root" "-I$src_root" "-I$src_base" "-I$src_base/src"
-if $gcc
+if ($c.class == 'gcc')
{
c.coptions += -pedantic
diff --git a/libcmark-gfm/manifest b/libcmark-gfm/manifest
index 6854a2c..aed192a 100644
--- a/libcmark-gfm/manifest
+++ b/libcmark-gfm/manifest
@@ -3,7 +3,7 @@ name: libcmark-gfm
# Note: remember to update build/bootstrap.build!
#
-version: 0.29.0-a.1+4
+version: 0.29.0-a.1+5
upstream-version: 0.29.0.gfm.0
project: cmark-gfm