Skip to content
Browse files

Remove most references to AAA

  • Loading branch information...
1 parent 60a31f5 commit ff0c26aa693fd159980b9f4bb1714c2a856daab5 @thelema thelema committed Jan 3, 2010
Showing with 41 additions and 42 deletions.
  1. +9 −9 OMakefile
  2. +6 −6 README
  3. +2 −2 VERSION
  4. +6 −7 batteries.godiva
  5. +5 −5 aaa.ml → batteries.ml
  6. +3 −3 build/META.in
  7. +2 −2 ocamlinit
  8. +3 −3 src/OMakefile
  9. +2 −2 src/syntax/pa_comprehension/OMakefile
  10. +2 −2 src/syntax/pa_strings/OMakefile
  11. +1 −1 testsuite/_tags
View
18 OMakefile
@@ -16,11 +16,11 @@ OCAMLCFLAGS += -g
OCAMLDEP_MODULES_ENABLED = false
OCAMLROOT = $(shell ocamlfind printconf destdir)
-DOCROOT = /usr/share/doc/ocaml-aaa/
+DOCROOT = /usr/share/doc/ocaml-batteries/
BROWSER_COMMAND = x-www-browser %s
-NAME = aaa
-VERSION = 0.9.1
+NAME = batteries
+VERSION = 0.9.2
LIBSDIR = $(ROOT)/libs
@@ -31,16 +31,16 @@ clean:
rm -f $(filter-proper-targets $(ls R, .))
rm -f hdoc/*
-AAA_FILES[] = aaa.ml
+BAT_FILES[] = batteries.ml
.SUBDIRS: src testsuite
include OMakefile
- export AAA_FILES
+ export BAT_FILES
.SUBDIRS: libs
.SUBDIRS: estring
include OMakefile
- export AAA_FILES
+ export BAT_FILES
build/META: build/META.in
@@ -55,7 +55,7 @@ uninstall:
rm -rf $(DOCROOT)
install: all build/META
- $(OCAMLFIND) install $(NAME) build/META $(AAA_FILES)
+ $(OCAMLFIND) install $(NAME) build/META $(BAT_FILES)
doc: src/batteries.cma
if $(not $(test -e hdoc/index.html))
@@ -70,7 +70,7 @@ install-doc: doc
test: testsuite/main.opt testsuite/main.run
testsuite/main.opt && testsuite/main.run
-release: :exists: aaa-batteries-$(VERSION).tar.gz
- git archive --format=tar --prefix=aaa-batteries-$(VERSION)/ HEAD | gzip > aaa-batteries-$(VERSION).tar.gz
+release: :exists: ocaml-batteries-$(VERSION).tar.gz
+ git archive --format=tar --prefix=batteries-$(VERSION)/ HEAD | gzip > batteries-$(VERSION).tar.gz
View
12 README
@@ -37,9 +37,9 @@ To test your install, execute
$ omake test
-*** Using AAA Batteries ***
+*** Using Batteries ***
-To get started using AAA-batteries at the toplevel, copy the ocamlinit
+To get started using Batteries at the toplevel, copy the ocamlinit
file to ~/.ocamlinit:
$ cp ocamlinit ~/.ocamlinit
@@ -50,10 +50,10 @@ last line in our ocamlinit to load batteries.
*** ExtLib Compatibility ***
If your project currently uses ExtLib, most likely you can just change
-[-package extlib] to [-package aaa] and add [open Extlibcompat] to the
-top of any extlib-using modules. Batteries' modules are all named
-BatFoo to differentiate them from extlib's modules, so one can use
-Batteries and ExtLib in the same project.
+[-package extlib] to [-package batteries] and add [open Extlibcompat]
+to the top of any extlib-using modules. Batteries' modules are all
+named BatFoo to differentiate them from extlib's modules, so one can
+use Batteries and ExtLib in the same project.
COMPATIBILITY NOTE: If you're using ExtLib's Unzip module, it does not
have a corresponding module in batteries at the moment.
View
4 VERSION
@@ -1,5 +1,5 @@
-This is the Release Candidate release of AAA Batteries.
-= Changes from Batteries Included
+This is Batteries Included version 0.9.2
+= Changes from beta 1
== General
* Reorganized all files, redoing the fundamental structure of batteries
* Changed build system to OMake
View
13 batteries.godiva
@@ -1,19 +1,18 @@
-Package: godi-aaa-batteries
+Package: godi-batteries
Version: 0.200911
Revision: 1
Depends: godi-ocaml (>= 3.10), godi-findlib (>= 1.2), godi-camomile (>= 0.7), godi-zip (>= 1.0), godi-ocamlnet (>= 2.2.9)
Build-Depends: godi-findlib (>= 1.2)
-Sources: http://github.com/thelema/AAA-batteries/tarball/aaa
-Homepage: http://github.com/thelema/AAA-batteries
+Sources: https://forge.ocamlcore.org/frs/download.php/334/aaa-batteries-0.9.1.tar.gz
+Homepage: http://batteries.forge.ocamlcore.org
Maintainer: Edgar Friendly <thelema314@gmail.com>
Options: opt, htdoc, configure
Docfiles: README, VERSION, LICENSE, doc
-Description: OCaml AAA Batteries: a simplified community-maintained foundation library for your OCaml projects.
-AAA Batteries Included serves the following purposes:
+Description: OCaml Batteries: a simplified community-maintained foundation library for your OCaml projects.
+Ocaml Batteries Included serves the following purposes:
* define a standard set of libraries which may be
expected on every compliant installation of OCaml
-* organize these libraries into a hierarchy of modules,
- with one source of documentation
+* organize these libraries into a hierarchy of modules
* provide a consistent API for otherwise independent
libraries.
.
View
10 aaa.ml → batteries.ml
@@ -43,14 +43,14 @@ Sys.interactive := false;; (*Pretend to be in non-interactive mode to avoid topl
#use "topfind";;
*)
#thread;;
-#require "aaa";;
+#require "batteries";;
if interactive then (*Only initialize help and display welcome if we're in interactive mode.*)
begin
Batteries_help.init ();
print_endline " _________________________";
- print_endline " [| + | | AAA Batteries - |";
+ print_endline " [| + | | Batteries - |";
print_endline " |_____|_|_________________|";
print_endline " _________________________";
print_endline " | - Type '#help;;' | | + |]";
@@ -70,10 +70,10 @@ open Batteries;;
if ext_syntax then begin
print_endline "Loading syntax extensions...";
Topfind.standard_syntax();
- Topfind.load_deeply ["camlp4"; "aaa.pa_string.syntax";
- "aaa.pa_comprehension.syntax"];
+ Topfind.load_deeply ["camlp4"; "batteries.pa_string.syntax";
+ "batteries.pa_comprehension.syntax"];
end else
- print_endline "AAA Syntax extensions disabled.";
+ print_endline "Batteries Syntax extensions disabled.";
;;
Sys.interactive := interactive;; (*Return to regular interactive mode*)
View
6 build/META.in
@@ -1,6 +1,6 @@
-name="aaa"
+name="batteries"
version="@VERSION@"
-description="Batteries Included AAA, lite distribution of OCaml libraries"
+description="Batteries Included, the stdlib of choice"
requires="unix,num,bigarray,str,findlib,camomile"
requires(mt)="unix,num,bigarray,threads,str,findlib,camomile"
archive(toploop)="batteries.cma,batteries_help.cmo"
@@ -39,7 +39,7 @@ package "syntax" (
# be set" even when we require camlp4 or set preprocessor here, so
# we use a brute-force approach
requires = "camlp4, estring"
- requires(toploop) = "camlp4, estring, aaa"
+ requires(toploop) = "camlp4, estring, batteries"
archive(syntax, preprocessor) = "pa_strings.cma pa_comprehension.cmo"
archive(syntax, toploop) = "pa_strings.cma pa_comprehension.cmo"
)
View
4 ocamlinit
@@ -1,9 +1,9 @@
let interactive = !Sys.interactive;;
Sys.interactive := false;; (*Pretend to be in non-interactive mode*)
-
#use "topfind";;
Sys.interactive := interactive;; (*Return to regular interactive mode*)
+
Toploop.use_silently
Format.err_formatter (Filename.concat (Findlib.package_directory
- "aaa") "aaa.ml");;
+ "batteries") "batteries.ml");;
View
6 src/OMakefile
@@ -1,9 +1,9 @@
.SUBDIRS: syntax
- export AAA_FILES
+ export BAT_FILES
.SUBDIRS: pa_comprehension pa_strings
include OMakefile
- export AAA_FILES
+ export BAT_FILES
EXTRA[] =
batteries_help.cmo
@@ -106,6 +106,6 @@ batteries_config.ml: batteries_config.mlp
batteries_config.mlp > batteries_config.ml
chmod(444 batteries_config.ml)
-AAA_FILES[] += $(file $(glob *.mli *.cmi *.cma *.cmxa *.a $(EXTRA)))
+BAT_FILES[] += $(file $(glob *.mli *.cmi *.cma *.cmxa *.a $(EXTRA)))
all: batteries.cmxa batteries.cma $(EXTRA)
View
4 src/syntax/pa_comprehension/OMakefile
@@ -7,5 +7,5 @@ FILES[] = pa_comprehension.cmo
all: $(FILES)
-AAA_FILES[] += $(file $(FILES))
-export AAA_FILES
+BAT_FILES[] += $(file $(FILES))
+export BAT_FILES
View
4 src/syntax/pa_strings/OMakefile
@@ -12,5 +12,5 @@ all: pa_strings.cma
FILES[] = pa_strings.cma
-AAA_FILES[] += $(file $(FILES))
-export AAA_FILES
+BAT_FILES[] += $(file $(FILES))
+export BAT_FILES
View
2 testsuite/_tags
@@ -1 +1 @@
-<*>: pkg_oUnit, pkg_aaa, thread
+<*>: pkg_oUnit, pkg_batteries, thread

0 comments on commit ff0c26a

Please sign in to comment.
Something went wrong with that request. Please try again.