Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.1.1 proposal for -safe-string support #1

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: bc1e05bfc8b39b664f29dae8dbd3ebbb)
# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)

SETUP = ocaml setup.ml

Expand All @@ -12,7 +12,7 @@ doc: setup.data build
test: setup.data build
$(SETUP) -test $(TESTFLAGS)

all:
all:
$(SETUP) -all $(ALLFLAGS)

install: setup.data
Expand All @@ -24,15 +24,18 @@ uninstall: setup.data
reinstall: setup.data
$(SETUP) -reinstall $(REINSTALLFLAGS)

clean:
clean:
$(SETUP) -clean $(CLEANFLAGS)

distclean:
distclean:
$(SETUP) -distclean $(DISTCLEANFLAGS)

setup.data:
$(SETUP) -configure $(CONFIGUREFLAGS)

configure:
$(SETUP) -configure $(CONFIGUREFLAGS)

.PHONY: build doc test all install uninstall reinstall clean distclean configure

# OASIS_STOP
Expand Down
6 changes: 3 additions & 3 deletions _oasis
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
OASISFormat: 0.1
OASISFormat: 0.4
Name: snappy
Version: 0.1.0
Version: 0.1.1
Synopsis: Bindings to snappy compression library
Authors: ygrek
Copyrights: (C) 2011 ygrek
License: BSD3
License: BSD-3-clause
Plugins: DevFiles (0.3), META (0.3)
BuildTools: ocamlbuild
Homepage: http://snappy.forge.ocamlcore.org/
Expand Down
11 changes: 6 additions & 5 deletions _tags
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# OASIS_START
# DO NOT EDIT (digest: 8ed89b3b80ed4061878819aed0d91040)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# DO NOT EDIT (digest: da1b639a772265e69ef81d5fe0bb44ea)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
true: annot, bin_annot
<**/.svn>: -traverse
<**/.svn>: not_hygienic
".bzr": -traverse
Expand All @@ -15,7 +16,7 @@
"_darcs": not_hygienic
# Library snappy
"src/snappy.cmxs": use_snappy
<src/*.ml{,i}>: oasis_library_snappy_ccopt
<src/*.ml{,i,y}>: oasis_library_snappy_ccopt
"src/snappy_stubs.c": oasis_library_snappy_ccopt
<src/snappy.{cma,cmxa}>: oasis_library_snappy_cclib
"src/libsnappy_stubs.lib": oasis_library_snappy_cclib
Expand All @@ -25,6 +26,6 @@
<src/snappy.{cma,cmxa}>: use_libsnappy_stubs
# Executable test
<test.{native,byte}>: use_snappy
<*.ml{,i}>: use_snappy
<*.ml{,i,y}>: use_snappy
<test.{native,byte}>: custom
# OASIS_STOP
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/sh

# OASIS_START
# DO NOT EDIT (digest: 425187ed8bfdbdd207fd76392dd243a7)
# DO NOT EDIT (digest: dc86c2ad450f91ca10c931b6045d0499)
set -e

FST=true
for i in "$@"; do
for i in "$@"; do
if $FST; then
set --
FST=false
Expand Down
Loading