redsnow 0.3.7 → 0.4.0

data/ext/drafter/circle.yml

@@ -0,0 +1,12 @@
+checkout:
+  post:
+    - git submodule update --init --recursive
+
+dependencies:
+  pre:
+    
+test:
+  pre:
+    - ./configure -i
+  override:
+    - make test

data/ext/{snowcrash → drafter}/config.gypi

@@ -5,6 +5,6 @@
                        'include_dirs': [],
                        'libraries': []},
   'variables': { 'host_arch': 'x64',
-                 'libsnowcrash_type': 'shared_library',
+                 'libdrafter_type': 'shared_library',
                  'python': '/usr/local/opt/python/bin/python2.7',
                  'target_arch': 'x64'}}

data/ext/{snowcrash → drafter}/configure

@@ -5,6 +5,17 @@
 # This file uses parts of Node.js `configure`.
 # Please refer to https://github.com/joyent/node.
 #
+import sys
+
+
+if sys.version_info.major != 2:
+    # Since various Linux distros and OS X doesn't properly follow PEP 394,
+    # We've set the shebang line to `python` and erroring when it isn't
+    # Python 2.
+    print('{} requires Python 2, please install Python 2 and re-run this script.'.format(sys.argv[0]))
+    print('You may be able to do this with `python2 configure`.')
+    sys.exit()
+
 import optparse
 import os
 import pprint
@@ -34,7 +45,7 @@ parser.add_option("--dest-cpu",
 parser.add_option("--shared",
     action="store_true",
     dest="shared",
-    help="Build and use shared libsnowcrash instead of static one.")
+    help="Build and use shared libdrafter instead of static one.")
 
 parser.add_option("-i", "--include-integration-tests",
     action="store_true",
@@ -113,7 +124,7 @@ def host_arch_win():
 
   return matchup.get(arch, 'ia32')  
 
-def configure_snowcrash(o):
+def configure_drafter(o):
   # Build configuration
   o['default_configuration'] = 'Debug' if options.debug else 'Release'
 
@@ -122,7 +133,7 @@ def configure_snowcrash(o):
   target_arch = options.dest_cpu or host_arch
   o['variables']['host_arch'] = host_arch
   o['variables']['target_arch'] = target_arch
-  o['variables']['libsnowcrash_type'] = 'shared_library' if options.shared else 'static_library'
+  o['variables']['libdrafter_type'] = 'shared_library' if options.shared else 'static_library'
 
 #
 # Cucumber testing environment
@@ -157,7 +168,7 @@ output = {
   'cflags': [],
 }
 
-configure_snowcrash(output)
+configure_drafter(output)
 
 # variables should be a root level element,
 # move everything else to target_defaults
@@ -207,7 +218,7 @@ else:
 if os.path.exists(options_fn):
   gyp_args.extend(['-I', options_fn])
 
-subprocess.call([sys.executable, 'tools/gyp/gyp_main.py'] + gyp_args)
+subprocess.call([sys.executable, 'ext/snowcrash/tools/gyp/gyp_main.py'] + gyp_args)
 
 # All done
 print("All OK.")

data/ext/drafter/drafter.gyp

@@ -0,0 +1,118 @@
+{
+  "includes": [
+    "ext/snowcrash/common.gypi"
+  ],
+  
+  "targets" : [
+    {
+      'target_name': 'libsos',
+      'type': 'static_library',
+      'include_dirs': [
+        'ext/sos/src'
+      ],
+      'sources': [
+        'ext/sos/src/sos.cc',
+        'ext/sos/src/sos.h',
+        'ext/sos/src/sosJSON.h',
+        'ext/sos/src/sosYAML.h'
+      ]
+    },
+    {
+      "target_name": "libdrafter",
+      'type': '<(libdrafter_type)',
+
+      "sources": [
+        "src/drafter.h",
+        "src/drafter.cc",
+        "src/cdrafter.h",
+        "src/cdrafter.cc",
+
+        "src/stream.h",
+        "src/Version.h",
+
+        "src/Serialize.h",
+        "src/Serialize.cc",
+        "src/SerializeAST.h",
+        "src/SerializeAST.cc",
+        "src/SerializeSourcemap.h",
+        "src/SerializeSourcemap.cc",
+        "src/SerializeResult.h",
+        "src/SerializeResult.cc",
+      ],
+
+      # FIXME: replace by direct dependecies
+      "include_dirs": [
+        "ext/snowcrash/ext/markdown-parser/src",
+        "ext/snowcrash/ext/markdown-parser/ext/sundown/src",
+        "ext/sos/src",
+        "ext/snowcrash/src",
+      ],
+
+      "dependencies": [
+	"libsos",
+        "ext/snowcrash/snowcrash.gyp:libsnowcrash",
+        "ext/snowcrash/snowcrash.gyp:libmarkdownparser",
+        "ext/snowcrash/snowcrash.gyp:libsundown",
+      ],
+    },
+
+    {
+      'target_name': 'test-libdrafter',
+      'type': 'executable',
+      'include_dirs': [
+        'src',
+        'test',
+        'test/vendor/Catch/include',
+        "ext/snowcrash/src",
+        "ext/snowcrash/ext/markdown-parser/src",
+        "ext/snowcrash/ext/markdown-parser/ext/sundown/src",
+        "ext/sos/src",
+      ],
+      'sources': [
+        "test/test-main.cc",
+        "test/test-SerializeResult.cc",
+        "test/test-cdrafter.cc",
+      ],
+      'dependencies': [
+        "libdrafter",
+        "libsos",
+        "ext/snowcrash/snowcrash.gyp:libsnowcrash",
+        "ext/snowcrash/snowcrash.gyp:libmarkdownparser",
+        "ext/snowcrash/snowcrash.gyp:libsundown",
+      ],
+      'conditions': [
+         [ 'OS=="win"', { 'defines' : [ 'WIN' ] } ]
+      ],
+    },
+
+    {
+      "target_name": "drafter",
+      "type": "executable",
+      "sources": [
+        "src/main.cc",
+        "src/config.cc",
+        "src/config.h",
+        "src/reporting.cc",
+        "src/reporting.h",
+      ],
+
+      # FIXME: replace by direct dependecies
+      "include_dirs": [
+        "ext/cmdline",
+        "ext/snowcrash/ext/markdown-parser/src",
+        "ext/snowcrash/ext/markdown-parser/ext/sundown/src",
+        "ext/sos/src",
+        "ext/snowcrash/src",
+      ],
+
+      "dependencies": [
+        "libdrafter",
+        "libsos",
+        "ext/snowcrash/snowcrash.gyp:libsnowcrash",
+        "ext/snowcrash/snowcrash.gyp:libmarkdownparser",
+        "ext/snowcrash/snowcrash.gyp:libsundown",
+      ],
+    },
+
+  ],
+}

data/ext/{snowcrash → drafter/ext/snowcrash}/Makefile

@@ -10,9 +10,9 @@ DESTDIR ?= /usr/local/bin
 V ?= 1
 
 # Targets
-all: libsnowcrash test-libsnowcrash snowcrash
+all: libsnowcrash test-libsnowcrash 
 
-.PHONY: libsnowcrash test-libsnowcrash snowcrash
+.PHONY: libsnowcrash test-libsnowcrash 
 
 libsnowcrash: config.gypi $(BUILD_DIR)/Makefile
 	$(MAKE) -C $(BUILD_DIR) V=$(V) libsnowcrash
@@ -27,11 +27,6 @@ perf-libsnowcrash: config.gypi $(BUILD_DIR)/Makefile
 	mkdir -p ./bin
 	cp -f $(BUILD_DIR)/out/$(BUILDTYPE)/perf-libsnowcrash ./bin/perf-libsnowcrash
 
-snowcrash: config.gypi $(BUILD_DIR)/Makefile
-	$(MAKE) -C $(BUILD_DIR) V=$(V) snowcrash
-	mkdir -p ./bin
-	cp -f $(BUILD_DIR)/out/$(BUILDTYPE)/snowcrash ./bin/snowcrash
-
 config.gypi: configure
 	$(PYTHON) ./configure
 
@@ -48,7 +43,7 @@ distclean:
 	rm -f ./config.gypi
 	rm -rf ./bin
 
-test: test-libsnowcrash snowcrash
+test: test-libsnowcrash 
 	$(BUILD_DIR)/out/$(BUILDTYPE)/test-libsnowcrash
 
 ifdef INTEGRATION_TESTS
@@ -58,7 +53,4 @@ endif
 perf: perf-libsnowcrash
 	$(BUILD_DIR)/out/$(BUILDTYPE)/perf-libsnowcrash ./test/performance/fixtures/fixture-1.apib
 
-install: snowcrash
-	cp -f $(BUILD_DIR)/out/$(BUILDTYPE)/snowcrash $(DESTDIR)/snowcrash
-
-.PHONY: libsnowcrash test-libsnowcrash perf-libsnowcrash snowcrash clean distclean test
+.PHONY: libsnowcrash test-libsnowcrash perf-libsnowcrash clean distclean test

data/ext/{snowcrash → drafter/ext/snowcrash}/Vagrantfile

@@ -2,16 +2,26 @@ Vagrant.configure("2") do |config|
   config.vm.box = "precise64"
   config.vm.box_url = "http://files.vagrantup.com/precise64.box"
 
+  cpus = "1"
+  if ENV['VAGRANT_CPUS']
+    cpus = ENV['VAGRANT_CPUS']
+  end
+
+  memory = "4096"
+  if ENV['VAGRANT_MEMORY']
+    memory = ENV['VAGRANT_MEMORY']
+  end
+
   # VirtualBox
   config.vm.provider :virtualbox do |vb|
-    vb.customize ["modifyvm", :id, "--memory", "2048"]
-    vb.customize ["modifyvm", :id, "--cpus", "1"]  
+    vb.customize ["modifyvm", :id, "--memory", memory]
+    vb.customize ["modifyvm", :id, "--cpus", cpus]
   end
 
   # VMWare Fusion
   config.vm.provider :vmware_fusion do |vb|
-    vb.vmx["memsize"] = "4096"
-    vb.vmx["numvcpus"] = "1" 
+    vb.vmx["memsize"] = memory
+    vb.vmx["numvcpus"] = cpus
   end
 
   config.vm.network :private_network, ip: "10.3.3.3"

data/ext/drafter/ext/snowcrash/appveyor.yml

@@ -0,0 +1,7 @@
+version: 1.0.{build}
+
+install:
+  - git submodule update --init --recursive
+
+build_script:
+  - vcbuild.bat MSVC2013 test

data/ext/drafter/ext/snowcrash/configure

@@ -0,0 +1,197 @@
+#!/usr/bin/env python
+#
+# Attribution Notice
+# ------------------
+# This file uses parts of Node.js `configure`.
+# Please refer to https://github.com/joyent/node.
+#
+
+import sys
+
+
+if sys.version_info.major != 2:
+    # Since various Linux distros and OS X doesn't properly follow PEP 394,
+    # We've set the shebang line to `python` and erroring when it isn't
+    # Python 2.
+    print('{} requires Python 2, please install Python 2 and re-run this script.'.format(sys.argv[0]))
+    print('You may be able to do this with `python2 configure`.')
+    sys.exit()
+
+
+import optparse
+import os
+import pprint
+import re
+import shlex
+import subprocess
+import platform
+
+CC = os.environ.get('CC', 'cc')
+
+root_dir = os.path.dirname(__file__)
+build_dir = './build'
+
+# Parse options
+parser = optparse.OptionParser()
+parser.add_option("--debug",
+    action="store_true",
+    dest="debug",
+    help="Also build the debug build.")
+
+parser.add_option("--dest-cpu",
+    action="store",
+    dest="dest_cpu",
+    help="CPU architecture to build for. Valid values are: ia32, x64.")
+
+parser.add_option("--shared",
+    action="store_true",
+    dest="shared",
+    help="Build and use shared libsnowcrash instead of static one.")
+
+(options, args) = parser.parse_args()
+
+def write(filename, data):
+  filename = os.path.join(root_dir, filename)
+  print("creating " + filename)
+  f = open(filename, 'w+')
+  f.write(data)
+
+def cc_macros():
+  """Checks predefined macros using the CC command."""
+
+  try:
+    p = subprocess.Popen(shlex.split(CC) + ['-dM', '-E', '-'],
+                         stdin=subprocess.PIPE,
+                         stdout=subprocess.PIPE,
+                         stderr=subprocess.PIPE)
+  except OSError:
+    print('''Configure error: No acceptable C compiler found!
+
+        Please make sure you have a C compiler installed on your system and/or
+        consider adjusting the CC environment variable if you installed
+        it in a non-standard prefix.
+        ''')
+    sys.exit()
+
+  p.stdin.write('\n')
+  out = p.communicate()[0]
+
+  out = str(out).split('\n')
+
+  k = {}
+  for line in out:
+    lst = shlex.split(line)
+    if len(lst) > 2:
+      key = lst[1]
+      val = lst[2]
+      k[key] = val
+  return k
+
+def host_arch_cc():
+  """Host architecture check using the CC command."""
+
+  k = cc_macros()
+
+  matchup = {
+    '__x86_64__'  : 'x64',
+    '__i386__'    : 'ia32',
+    '__arm__'     : 'arm',
+  }
+
+  rtn = 'ia32' # default
+
+  for i in matchup:
+    if i in k and k[i] != '0':
+      rtn = matchup[i]
+      break
+
+  return rtn
+
+def host_arch_win():
+  """Host architecture check using environ vars (better way to do this?)"""
+
+  arch = os.environ.get('PROCESSOR_ARCHITECTURE', 'x86')
+
+  matchup = {
+    'AMD64'  : 'x64',
+    'x86'    : 'ia32',
+    'arm'    : 'arm',
+  }
+
+  return matchup.get(arch, 'ia32')  
+
+def configure_snowcrash(o):
+  # Build configuration
+  o['default_configuration'] = 'Debug' if options.debug else 'Release'
+
+  # Architecture
+  host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc()
+  target_arch = options.dest_cpu or host_arch
+  o['variables']['host_arch'] = host_arch
+  o['variables']['target_arch'] = target_arch
+  o['variables']['libsnowcrash_type'] = 'shared_library' if options.shared else 'static_library'
+
+#
+# config.gypi
+#
+output = {
+  'variables': { 'python': sys.executable },
+  'include_dirs': [],
+  'libraries': [],
+  'defines': [],
+  'cflags': [],
+}
+
+configure_snowcrash(output)
+
+# variables should be a root level element,
+# move everything else to target_defaults
+variables = output['variables']
+del output['variables']
+output = {
+  'variables': variables,
+  'target_defaults': output
+}
+
+write('config.gypi', "# Do not edit. Generated by the configure script.\n" +
+  pprint.pformat(output, indent=2) + "\n")
+
+#
+# config.mk
+# 
+config = {
+  'BUILDTYPE': 'Debug' if options.debug else 'Release',
+  'PYTHON': sys.executable,
+  'BUILD_DIR': build_dir,
+}
+config = '\n'.join(map('='.join, config.iteritems())) + '\n'
+
+write('config.mk',
+      '# Do not edit. Generated by the configure script.\n' + config)
+
+#
+# Gyp call
+#
+print("creating makefiles")
+
+gyp_args = ['--generator-output', build_dir, '--depth', '.']
+if sys.platform == 'win32':
+  # Windows
+  gyp_args.extend(['-f', 'msvs'])
+else:
+  # Posix systems
+  gyp_args.extend(['-f', 'make'])
+
+# Include common.gypi and config.gypi 
+if sys.platform == 'win32':
+  options_fn = os.path.join(root_dir, 'config.gypi')
+else:
+  options_fn = os.path.join(os.path.abspath(root_dir), 'config.gypi')
+
+if os.path.exists(options_fn):
+  gyp_args.extend(['-I', options_fn])
+
+subprocess.call([sys.executable, 'tools/gyp/gyp_main.py'] + gyp_args)
+
+# All done
+print("All OK.")