Permalink
Browse files

Finish the bootstrap (for the case we only consider the library part …

…of ocp-get).
  • Loading branch information...
1 parent 2e42ad7 commit 7e293d3b018cfbf51cd391f14719c69a8edc8246 @tuong tuong committed Mar 28, 2012
View
@@ -5,7 +5,7 @@
# Prerequisites:
* ocaml
-* wget
+* wget (or ftp for "Darwin")
* tar
To compile `ocp-get`, simply run:
@@ -26,9 +26,17 @@ This will run the server in debug mode. It will show the IP address it
is listening to. If this address is different of `127.0.0.1` you
should set the environment variable `LOCALHOST` accordingly.
-You can then open a new terminal window and run:
+You can then open a new terminal window and either run:
```
make tests
```
+or
+
+```
+make -C tests ocpget
+```
+to compile `ocp-get` once again.
+But this time, the complete installation will be orchestrated
+by the existing `ocp-get` itself.
View
@@ -14,7 +14,7 @@ ARCHIVES = $(PACKAGES:%=packages/%.tar.gz)
.PHONY: all upload
-all: fresh init upload list install upload-new upgrade downgrade ocpbuild
+all: fresh init upload list install upload-new upgrade downgrade ocpbuild #ocpget
@
$(BIN)/ocp-get: ../ocp-get
@@ -64,6 +64,10 @@ downgrade: upgrade
$(OCPGET) install P4-2
$(OCPGET) list
+ocpget: fresh init ocpbuild
+ cd packages/bootstrap && for i in *spec ; do $(OCPGET) upload $$i ; done
+ $(OCPGET) install ocpget
+
packages/%.tar.gz: packages/% packages/%/*
cd packages && tar cz $* > $*.tar.gz
@@ -1,15 +1,6 @@
install "ocamlgraph" {
lib = [
- "_obuild/graph/*.cma";
- "_obuild/graph/*.cmxa";
- "_obuild/graph/*.a";
- "_obuild/graph/*.cmi";
-
-(* warning : at copy, we may conserve the structure *)
-
- "_obuild/graph/Graph/*.cma";
- "_obuild/graph/Graph/*.cmxa";
- "_obuild/graph/Graph/*.a";
- "_obuild/graph/Graph/*.cmi";
+ "_obuild/graph/graph.cma";
+ "_obuild/graph/graph.cmi";
]
}
@@ -4,5 +4,15 @@ install "ocpget" {
"_obuild/ocp-get-lib/*.cmxa";
"_obuild/ocp-get-lib/*.a";
"_obuild/ocp-get-lib/*.cmi";
+
+ "_obuild/ocp-get/*.cma";
+ "_obuild/ocp-get/*.cmxa";
+ "_obuild/ocp-get/*.a";
+ "_obuild/ocp-get/*.cmi";
+
+ "_obuild/ocp-get-server/*.cma";
+ "_obuild/ocp-get-server/*.cmxa";
+ "_obuild/ocp-get-server/*.a";
+ "_obuild/ocp-get-server/*.cmi";
]
}
@@ -29,10 +29,11 @@ begin library "ocp-get-lib"
"unix"
"extlib"
"ocamlarg"
+ "ocamlgraph"
]
end
-(*
-begin program "ocp-get"
+
+begin library "ocp-get"
(*
ocamlc = [ "ocp-ocamlc.opt" ]
ocamlopt = [ "ocp-ocamlopt.opt" ]
@@ -47,7 +48,7 @@ begin program "ocp-get"
requires = [ "ocp-get-lib" ]
end
-begin program "ocp-get-server"
+begin library "ocp-get-server"
(*
ocamlc = [ "ocp-ocamlc.opt" ]
ocamlopt = [ "ocp-ocamlopt.opt" ]
@@ -57,4 +58,3 @@ begin program "ocp-get-server"
files = [ "ocp_get_server.ml" ]
requires = [ "ocp-get-lib" ]
end
-*)

0 comments on commit 7e293d3

Please sign in to comment.