Selaa lähdekoodia

[dune] update to dune 3.0 (#10925)

* [dune] update to dune 3.5

* [dune] try 3.0
Rudy Ges 2 vuotta sitten
vanhempi
commit
6f15597dda
8 muutettua tiedostoa jossa 22 lisäystä ja 17 poistoa
  1. 2 2
      dune-project
  2. 7 3
      libs/extc/dune
  3. 4 4
      libs/mbedtls/dune
  4. 0 0
      libs/objsize/alloc.h
  5. 1 1
      libs/objsize/bitarray.h
  6. 1 1
      libs/objsize/c_objsize.c
  7. 3 4
      libs/objsize/dune
  8. 4 2
      libs/pcre/dune

+ 2 - 2
dune-project

@@ -1,4 +1,4 @@
-(lang dune 1.11)
+(lang dune 3.0)
 (name haxe)
 (name haxe)
 
 
 (package
 (package
@@ -7,4 +7,4 @@
 
 
 (package
 (package
 	(name haxe_prebuild)
 	(name haxe_prebuild)
-)
+)

+ 7 - 3
libs/extc/dune

@@ -3,14 +3,18 @@
 (library
 (library
 	(name extc)
 	(name extc)
 	(libraries extlib)
 	(libraries extlib)
-	(c_names extc_stubs)
+	(foreign_stubs
+		(language c)
+		(names extc_stubs))
 	(modules extc)
 	(modules extc)
 	(wrapped false)
 	(wrapped false)
 )
 )
 
 
 (library
 (library
 	(name extproc)
 	(name extproc)
-	(c_names process_stubs)
+	(foreign_stubs
+		(language c)
+		(names process_stubs))
 	(modules process)
 	(modules process)
 	(wrapped false)
 	(wrapped false)
-)
+)

+ 4 - 4
libs/mbedtls/dune

@@ -2,8 +2,8 @@
 
 
 (library
 (library
 	(name mbedtls)
 	(name mbedtls)
-	(c_names
-		mbedtls_stubs
-	)
+	(foreign_stubs
+		(language c)
+		(names mbedtls_stubs))
 	(wrapped false)
 	(wrapped false)
-)
+)

+ 0 - 0
libs/objsize/alloc.c → libs/objsize/alloc.h


+ 1 - 1
libs/objsize/bitarray.c → libs/objsize/bitarray.h

@@ -14,7 +14,7 @@ void PRF(_set)(TYPE arr[], size_t i, TYPE val);
 
 
 #define ALLOC_TYPE unsigned char
 #define ALLOC_TYPE unsigned char
 #define ALLOC_PRF(x) ALPRF(x)
 #define ALLOC_PRF(x) ALPRF(x)
-#include "alloc.c"
+#include "alloc.h"
 
 
 
 
 size_t wordalign(size_t n)
 size_t wordalign(size_t n)

+ 1 - 1
libs/objsize/c_objsize.c

@@ -7,7 +7,7 @@
 
 
 
 
 #define PRF(x) bitarray##x
 #define PRF(x) bitarray##x
-#include "bitarray.c"
+#include "bitarray.h"
 
 
 #include "util.h"
 #include "util.h"
 
 

+ 3 - 4
libs/objsize/dune

@@ -2,8 +2,7 @@
 
 
 (library
 (library
 	(name objsize)
 	(name objsize)
-	(c_names c_objsize)
-	(c_flags (-I../../../../libs/objsize)) ; TODO: This is stupid
+	(foreign_stubs (language c) (names c_objsize) (flags -O1 -W -Wall -Werror -fPIC))
+	(flags :standard -warn-error -a+8)
 	(wrapped false)
 	(wrapped false)
-	(modules objsize)
-)
+	(modules objsize))

+ 4 - 2
libs/pcre/dune

@@ -2,6 +2,8 @@
 
 
 (library
 (library
 	(name pcre)
 	(name pcre)
-	(c_names pcre_stubs)
+	(foreign_stubs
+		(language c)
+		(names pcre_stubs))
 	(wrapped false)
 	(wrapped false)
-)
+)