Anonymous avatar Anonymous committed ffb76ec

update hevea + small changes for cygwin

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12975 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

Comments (0)

Files changed (5)

testsuite/external/.ignore

 *.zip
 
 log-*
+log_*
 
 advi
 advi-1.10.2
 geneweb
 gw-6.05-src
 hevea
-hevea-1.10
+hevea-2.00
 lablgtk
 lablgtk-2.14.2
 lablgtkextras
 xmlm-1.1.0
 zen
 zen_2.3.2
+._ZEN_2.3.2

testsuite/external/Makefile

 all: obrowser
 
 # http://hevea.inria.fr/
-HEVEA=hevea-1.10
+HEVEA=hevea-2.00
 ${HEVEA}.tar.gz:
 	${WGET} http://hevea.inria.fr/distri/$@
 hevea: ${HEVEA}.tar.gz
 	rm -f ${HEVEA}.tar.gz
 all: hevea
 
-# http://www.seas.upenn.edu/~bcpierce/unison//download/releases/
+# http://www.seas.upenn.edu/~bcpierce/unison/download/releases/
 UNISON=unison-2.45.4
 ${UNISON}.tar.gz:
 	${WGET} http://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.45.4/$@

testsuite/external/menhir-20120123.patch

+--- menhir-20120123/Makefile.arch.orig	2012-09-28 19:03:09.673811200 +0200
++++ menhir-20120123/Makefile.arch	2012-09-28 19:07:38.680344000 +0200
+@@ -1,7 +1,7 @@
+ # If ocaml reports that Sys.os_type is Unix, we assume Unix, otherwise
+ # we assume Windows.
+ 
+-ifeq "$(shell rm -f ./o.ml && echo print_endline Sys.os_type > ./o.ml && ocaml ./o.ml && rm -f ./o.ml)" "Unix"
++ifneq "$(shell rm -f ./o.ml && echo print_endline Sys.os_type > ./o.ml && ocaml ./o.ml && rm -f ./o.ml)" "Win32"
+ MENHIREXE    := menhir
+ OBJ          := o
+ else

testsuite/external/ocaml-mysql-1.0.4.patch

---- ocaml-mysql-1.0.4.orig/mysql_stubs.c	2006-02-24 00:12:36.000000000 +0100
-+++ ocaml-mysql-1.0.4/mysql_stubs.c	2012-08-09 20:51:24.000000000 +0200
-@@ -19,9 +19,9 @@
- 
- /* MySQL API */
- 
--#include <mysql/mysql.h>
--#include <mysql/mysqld_error.h>
--#include <mysql/errmsg.h>
-+#include <mysql.h>
-+#include <mysqld_error.h>
-+#include <errmsg.h>
- /* type 'a option = None | Some of 'a */
- 
- #define NONE            Val_int(0)     

testsuite/external/ocaml-mysql-1.0.4.patch.disabled

+--- ocaml-mysql-1.0.4.orig/mysql_stubs.c	2006-02-24 00:12:36.000000000 +0100
++++ ocaml-mysql-1.0.4/mysql_stubs.c	2012-08-09 20:51:24.000000000 +0200
+@@ -19,9 +19,9 @@
+ 
+ /* MySQL API */
+ 
+-#include <mysql/mysql.h>
+-#include <mysql/mysqld_error.h>
+-#include <mysql/errmsg.h>
++#include <mysql.h>
++#include <mysqld_error.h>
++#include <errmsg.h>
+ /* type 'a option = None | Some of 'a */
+ 
+ #define NONE            Val_int(0)     
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.