haxe/haxe.patch@870131689a5c (annotated)
haxe/haxe.patch
Sat, 21 May 2011 22:05:42 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 21 May 2011 22:05:42 +0200
- changeset 340
- 870131689a5c
- parent 112
- 6052d0605a74
- permissions
- -rw-r--r--
Correct diverse buildconf of upstream release and reconcile packaging somewhat.
These changes stem from the obvious changes in the latest vendor release, but
from discussions with trolls Daniel and Oswald as well regarding build config.
This commital follows conclusion of buildconf adjustments to allow the new
vendor version to build on Linux AMD64, but is incomplete as many packaging
comments show. The next series of changes focus on Solaris IA32 and reduction
of buildconf adjustments testing old problems comprehensively in anticipation
of discussion at the upcoming Nokia Contributor Summit in Berlin.
| michael@112 | 1 | Index: haxe/doc/install.ml |
| michael@112 | 2 | --- haxe/doc/install.ml.orig 2007-12-16 14:37:46 +0100 |
| michael@112 | 3 | +++ haxe/doc/install.ml 2008-05-30 14:06:45 +0200 |
| michael@112 | 4 | @@ -144,10 +144,10 @@ |
| michael@112 | 5 | in |
| michael@112 | 6 | let startdir = Sys.getcwd() in |
| michael@112 | 7 | try |
| michael@112 | 8 | - download(); |
| michael@112 | 9 | + (* download(); *) |
| michael@112 | 10 | compile(); |
| michael@112 | 11 | Sys.chdir startdir; |
| michael@112 | 12 | with |
| michael@112 | 13 | Failure msg -> |
| michael@112 | 14 | Sys.chdir startdir; |
| michael@112 | 15 | - prerr_endline msg; exit 1 |
| michael@112 | 16 | \ No newline at end of file |
| michael@112 | 17 | + prerr_endline msg; exit 1 |
| michael@113 | 18 | Index: haxe/parser.ml |
| michael@113 | 19 | --- haxe/parser.ml.orig 2008-11-25 21:20:36.000000000 +0100 |
| michael@113 | 20 | +++ haxe/parser.ml 2009-02-25 13:44:52.464412227 +0100 |
| michael@113 | 21 | @@ -299,9 +299,9 @@ |
| michael@113 | 22 | } |
| michael@113 | 23 | |
| michael@113 | 24 | and parse_type_path_or_const = parser |
| michael@113 | 25 | - | [< '(Const (String s),_); >] -> TPConst (String s) |
| michael@113 | 26 | - | [< '(Const (Int i),_); >] -> TPConst (Int i) |
| michael@113 | 27 | - | [< '(Const (Float f),_); >] -> TPConst (Float f) |
| michael@113 | 28 | + | [< '(Const (String s),_); placeholder1 >] -> TPConst (String s) |
| michael@113 | 29 | + | [< '(Const (Int i),_); placeholder2 >] -> TPConst (Int i) |
| michael@113 | 30 | + | [< '(Const (Float f),_); placeholder3 >] -> TPConst (Float f) |
| michael@113 | 31 | | [< t = parse_type_path >] -> TPType t |
| michael@113 | 32 | |
| michael@113 | 33 | and parse_type_path_next t = parser |
