Preparing GitHub transition

Author: mmottl

.gitignore

@@ -0,0 +1,8 @@
+_build
+API.docdir
+*.bak
+.*.swp
+setup.data
+setup.log
+*.byte
+*.native

.hgignore

@@ -1,10 +1,14 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 39a7158c5796d2c7f25e8d398114975e) *)
-Authors of postgresql-ocaml
-Alain Frisch <alain.frisch@lexifi.com>
-Markus Mottl <markus.mottl@gmail.com>
-
-Current maintainers of postgresql-ocaml
-Markus Mottl <markus.mottl@gmail.com>
-Alain Frisch <alain.frisch@lexifi.com>
+(* DO NOT EDIT (digest: 32172db7f4f788fae688e747cfda1b0e) *)
+
+Authors of postgresql-ocaml:
+
+* Alain Frisch <alain.frisch@lexifi.com>
+* Markus Mottl <markus.mottl@gmail.com>
+
+Current maintainers of postgresql-ocaml:
+
+* Markus Mottl <markus.mottl@gmail.com>
+* Alain Frisch <alain.frisch@lexifi.com>
+
 (* OASIS_STOP *)

AUTHORS.txt

@@ -1,5 +1,6 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 851a53835eb2a813e6aeb1a50279e0d5) *)
+(* DO NOT EDIT (digest: c9cde8d1d7a6bc1ed6236ec912d83768) *)
+
 This is the INSTALL file for the postgresql-ocaml distribution.
 
 This package uses OASIS to generate its build system. See section OASIS for
@@ -9,6 +10,7 @@ Dependencies
 ============
 
 In order to compile this package, you will need:
+
 * ocaml (>= 3.12) for all, doc API
 * findlib (>= 1.3.1)
 * lablgtk2 for executable prompt_gtk

INSTALL.txt

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 7b2408909643717852b95f994b273fee)
+# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
 
 SETUP = ocaml setup.ml
 
@@ -33,6 +33,9 @@ distclean:
 setup.data:
 	$(SETUP) -configure $(CONFIGUREFLAGS)
 
+configure:
+	$(SETUP) -configure $(CONFIGUREFLAGS)
+
 .PHONY: build doc test all install uninstall reinstall clean distclean configure
 
 # OASIS_STOP

Makefile

@@ -17,7 +17,7 @@ Usage
 
 The OCaml-API in file `lib/postgresql.mli` is well-documented and can be
 built as HTML with `make doc`.  The API-documentation can also be found
-[online](http://mmottl.bitbucket.org/projects/postgresql-ocaml/api/).
+[online](http://mmottl.github.io/postgresql-ocaml/api).
 
 More detailed information on how to interact with PostgreSQL is available
 in the [PostgreSQL-documentation](http://www.postgresql.org/docs).
@@ -36,8 +36,8 @@ contact the maintainers:
   * Alain Frisch <alain.frisch@lexifi.com>
 
 Up-to-date information should be available at:
-<https://bitbucket.org/mmottl/postgresql-ocaml>
+<http://mmottl.github.io/postgresql-ocaml>
 
 Enjoy!
 
-Markus Mottl in Rutherford, NJ on July 10, 2012
+Markus Mottl on July 10, 2012

README.md

@@ -1,6 +1,6 @@
 OASISFormat:      0.4
 Name:             postgresql-ocaml
-Version:          2.0.6
+Version:          2.0.7
 Synopsis:         postgresql-ocaml - bindings to the PostgreSQL library
 Description:      postgresql-ocaml offers library functions for accessing PostgreSQL databases
 Authors:          Alain Frisch <alain.frisch@lexifi.com>,
@@ -13,7 +13,7 @@ LicenseFile:      COPYING.txt
 License:          LGPL-2.1+ with OCaml linking exception
 OCamlVersion:     >= 3.12
 FindlibVersion:   >= 1.3.1
-Homepage:         https://bitbucket.org/mmottl/postgresql-ocaml
+Homepage:         http://mmottl.github.io/postgresql-ocaml
 #Categories:
 #FilesAB:
 
@@ -105,8 +105,8 @@ Document API
   XOCamlbuildPath:      .
   XOCamlbuildLibraries: postgresql
 
-SourceRepository trunk
-  Type:       hg
-  Location:   ssh://hg@bitbucket.org/mmottl/postgresql-ocaml
-  Browser:    https://bitbucket.org/mmottl/postgresql-ocaml
-  Tag:        release-$(pkg_version)
+SourceRepository head
+  Type:       Git
+  Location:   https://github.com/mmottl/postgresql-ocaml.git
+  Browser:    https://github.com/mmottl/postgresql-ocaml
+  Tag:        v$(pkg_version)

_oasis

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: b1ebcbe4043a5a4e27c03bddf1379855)
-version = "2.0.6"
+# DO NOT EDIT (digest: 13e6363a73a7b01be54f10b14d313f88)
+version = "2.0.7"
 description = "postgresql-ocaml - bindings to the PostgreSQL library"
 requires = "threads bigarray"
 archive(byte) = "postgresql.cma"

lib/META

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: d0d7a31f5fe589f4d2ca00034335e395) *)
+(* DO NOT EDIT (digest: 3e1cc8469630fbc253bc2218e937c7f6) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -39,10 +39,10 @@ module OASISExpr = struct
   open OASISGettext
 
 
-  type test = string 
+  type test = string
 
 
-  type flag = string 
+  type flag = string
 
 
   type t =
@@ -52,10 +52,10 @@ module OASISExpr = struct
     | EOr of t * t
     | EFlag of flag
     | ETest of test * string
-    
 
 
-  type 'a choices = (t * 'a) list 
+
+  type 'a choices = (t * 'a) list
 
 
   let eval var_get t =
@@ -259,6 +259,31 @@ module MyOCamlbuildFindlib = struct
     Ocamlbuild_pack.Lexers.blank_sep_strings
 
 
+  let exec_from_conf exec =
+    let exec =
+      let env_filename = Pathname.basename BaseEnvLight.default_filename in
+      let env = BaseEnvLight.load ~filename:env_filename ~allow_empty:true () in
+      try
+        BaseEnvLight.var_get exec env
+      with Not_found ->
+        Printf.eprintf "W: Cannot get variable %s\n" exec;
+        exec
+    in
+    let fix_win32 str =
+      if Sys.os_type = "Win32" then begin
+        let buff = Buffer.create (String.length str) in
+        (* Adapt for windowsi, ocamlbuild + win32 has a hard time to handle '\\'.
+         *)
+        String.iter
+          (fun c -> Buffer.add_char buff (if c = '\\' then '/' else c))
+          str;
+        Buffer.contents buff
+      end else begin
+        str
+      end
+    in
+      fix_win32 exec
+
   let split s ch =
     let buf = Buffer.create 13 in
     let x = ref [] in
@@ -286,17 +311,7 @@ module MyOCamlbuildFindlib = struct
     with Not_found -> s
 
   (* ocamlfind command *)
-  let ocamlfind x =
-    let ocamlfind_prog =
-      let env_filename = Pathname.basename BaseEnvLight.default_filename in
-      let env = BaseEnvLight.load ~filename:env_filename ~allow_empty:true () in
-      try
-        BaseEnvLight.var_get "ocamlfind" env
-      with Not_found ->
-        Printf.eprintf "W: Cannot get variable ocamlfind";
-        "ocamlfind"
-    in
-      S[Sh ocamlfind_prog; x]
+  let ocamlfind x = S[Sh (exec_from_conf "ocamlfind"); x]
 
   (* This lists all supported packages. *)
   let find_packages () =
@@ -325,7 +340,7 @@ module MyOCamlbuildFindlib = struct
 
   let dispatch =
     function
-      | Before_options ->
+      | After_options ->
           (* By using Before_options one let command line options have an higher
            * priority on the contrary using After_options will guarantee to have
            * the higher priority override default commands by ocamlfind ones *)
@@ -415,10 +430,10 @@ module MyOCamlbuildBase = struct
   module OC = Ocamlbuild_pack.Ocaml_compiler
 
 
-  type dir = string 
-  type file = string 
-  type name = string 
-  type tag = string 
+  type dir = string
+  type file = string
+  type name = string
+  type tag = string
 
 
 (* # 62 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
@@ -433,7 +448,7 @@ module MyOCamlbuildBase = struct
          * directory.
          *)
         includes:  (dir * dir list) list;
-      } 
+      }
 
 
   let env_filename =
@@ -476,7 +491,7 @@ module MyOCamlbuildBase = struct
                    try
                      opt := no_trailing_dot (BaseEnvLight.var_get var env)
                    with Not_found ->
-                     Printf.eprintf "W: Cannot get variable %s" var)
+                     Printf.eprintf "W: Cannot get variable %s\n" var)
                 [
                   Options.ext_obj, "ext_obj";
                   Options.ext_lib, "ext_lib";
@@ -576,7 +591,7 @@ module MyOCamlbuildBase = struct
 end
 
 
-# 579 "myocamlbuild.ml"
+# 594 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
@@ -634,7 +649,7 @@ let package_default =
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
 
-# 638 "myocamlbuild.ml"
+# 653 "myocamlbuild.ml"
 (* OASIS_STOP *)
 
 let () =