From 3c992b0bbed2912c5cdade7275101ade21b1460b Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Thu, 27 Feb 2014 13:16:54 +0100 Subject: [PATCH] removed old files --- CONTRIBUTING.md | 101 +++-- Installation/Contribute/Makefile.ubuntu | 57 --- Installation/Debian/postinst | 2 +- Installation/Debian/prerm | 1 - Installation/Debian/rc.arangodb | 1 - Installation/MacOSX/org.arangodb.plist | 21 - Installation/OBS/clean-repo.sh | 20 - Installation/OBS/create-repo.sh | 19 - Installation/OBS/create-ymp.sh | 36 -- Installation/OBS/index.html | 556 ------------------------ Installation/OBS/load-repo.sh | 9 - Installation/build.sh | 206 --------- Installation/coverage.sh | 149 ------- Installation/epm/arangodb.list | 225 ---------- Installation/packetize.sh | 511 ---------------------- Installation/unittests.sh | 105 ----- Makefile.am | 2 + UPGRADING | 2 +- js/common/modules/engine | 1 - 19 files changed, 80 insertions(+), 1944 deletions(-) delete mode 100644 Installation/Contribute/Makefile.ubuntu delete mode 100644 Installation/MacOSX/org.arangodb.plist delete mode 100755 Installation/OBS/clean-repo.sh delete mode 100755 Installation/OBS/create-repo.sh delete mode 100755 Installation/OBS/create-ymp.sh delete mode 100644 Installation/OBS/index.html delete mode 100755 Installation/OBS/load-repo.sh delete mode 100755 Installation/build.sh delete mode 100755 Installation/coverage.sh delete mode 100644 Installation/epm/arangodb.list delete mode 100755 Installation/packetize.sh delete mode 100755 Installation/unittests.sh delete mode 120000 js/common/modules/engine diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3fe83782c9..9654c27ac8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,45 +1,96 @@ -# Contributing +Contributing +============ We welcome bug fixes and patches from 3rd party contributors. + Please follow these guidelines if you want to contribute to ArangoDB: -## Getting started +Getting started +--------------- * Please make sure you have a GitHub account -* Please look into the ArangoDB issue tracker on GitHub for similar/identical issues -* For bugs: if the bug you found is not yet described in an existing issue, please file a new one. The new issue should include a clear description of the bug and how to reproduce it (including your environment) -* For feature requests: please clearly describe the proposed feature, additional configuration options, and side effects -* Please let us know if you plan to work an a ticket. This way we can make sure we avoid redundant work -* Create a fork our repository. You can use GitHub to do this -* Clone the fork to your development box and pull the latest changes from the ArangoDB repository. Please make sure to use the appropriate branch: +* Please look into the ArangoDB issue tracker on GitHub for similar/identical + issues. + +* For bugs: if the bug you found is not yet described in an existing + issue, please file a new one. The new issue should include a clear + description of the bug and how to reproduce it (including your + environment). + +* For feature requests: please clearly describe the proposed feature, additional + configuration options, and side effects. + +* Please let us know if you plan to work an a ticket. This way we can make sure + we avoid redundant work. + +* Create a fork our repository. You can use GitHub to do this. + +* Clone the fork to your development box and pull the latest changes from the + ArangoDB repository. Please make sure to use the appropriate branch: + * the "devel" branch is normally used for new features - * bug fixes should be done in the "devel" first, before being applied to master or other branches -* If missing, install the required prerequisites. They are listed [here](https://github.com/triAGENS/ArangoDB/wiki/Compiling). -* configure and make your local clone. If you intend to modify the parser files, please make sure to activate the --enable-maintainer-mode configure option. In this case, you also need to have Python installed. -* Make sure the unmodified clone works locally before making any code changes. You can do so by running the included test suite (i.e. make unittests) -* If you intend to do documentation changes, you also must install Doxygen in the most recent version. -## Making Changes + * bug fixes should be done in the "devel" first, before being applied to + master or other branches + +* If missing, install the required prerequisites. They are listed + [here](https://github.com/triAGENS/ArangoDB/wiki/Compiling). + +* configure and make your local clone. If you intend to modify the parser files, + please make sure to activate the --enable-maintainer-mode configure option. In + this case, you also need to have Python installed. + +* Make sure the unmodified clone works locally before making any code + changes. You can do so by running the included test suite (i.e. make + unittests) + +* If you intend to do documentation changes, you also must install Doxygen in + the most recent version. + +Making Changes +-------------- * Create a new branch in your fork + * Develop and test your modifications there -* Commit as you like, but preferrably in logical chunks. Use meaningful commit messages and make sure you do not commit unneccesary files (e.g. object files). It is normally a good idea to reference the issue number from the commit message so the issues will get updated automatically with comments -* If the modifications change any documented behavior or add new features, document the changes. The documentation can be found in arangod/Documentation directory. To recreate the documentation locally, run make doxygen. This will re-create all documentation files in the Doxygen directory in your repository. You can inspect the documentation in this folder using a text editor or a browser -* When done, run the complete test suite and make sure all tests pass -* When finished, push the changes to your GitHub repository and send a pull request from your fork to the ArangoDB repository. Please make sure to select the appropriate branches there -* You must use the Apache License for your changes -## Reporting Bugs +* Commit as you like, but preferrably in logical chunks. Use meaningful commit + messages and make sure you do not commit unneccesary files (e.g. object + files). It is normally a good idea to reference the issue number from the + commit message so the issues will get updated automatically with comments. -When reporting bugs, please use our issue tracker on GitHub. -Please make sure to include to include the version number of ArangoDB in your bug report, along with the platform you are using (e.g. `Linux OpenSuSE x86_64`). -Please also include the ArangoDB startup mode (daemon, console, supervisor mode) plus any special configuration. -This will help us reproducing and finding bugs. +* If the modifications change any documented behavior or add new features, + document the changes. The documentation can be found in arangod/Documentation + directory. To recreate the documentation locally, run make doxygen. This will + re-create all documentation files in the Doxygen directory in your + repository. You can inspect the documentation in this folder using a text + editor or a browser. -## Additional Resources +* When done, run the complete test suite and make sure all tests pass. + +* When finished, push the changes to your GitHub repository and send a pull + request from your fork to the ArangoDB repository. Please make sure to select + the appropriate branches there. + +* You must use the Apache License for your changes. + +Reporting Bugs +-------------- + +When reporting bugs, please use our issue tracker on GitHub. Please make sure +to include the version number of ArangoDB in your bug report, along with the +platform you are using (e.g. `Linux OpenSuSE x86_64`). Please also include the +ArangoDB startup mode (daemon, console, supervisor mode) plus any special +configuration. This will help us reproducing and finding bugs. + +Additional Resources +-------------------- * [ArangoDB website](https://www.arangodb.org/) + * [ArangoDB on Twitter](https://twitter.com/arangodb) + * [General GitHub documentation](https://help.github.com/) + * [GitHub pull request documentation](https://help.github.com/send-pull-requests/) diff --git a/Installation/Contribute/Makefile.ubuntu b/Installation/Contribute/Makefile.ubuntu deleted file mode 100644 index 629777286c..0000000000 --- a/Installation/Contribute/Makefile.ubuntu +++ /dev/null @@ -1,57 +0,0 @@ -SHELL=/bin/bash - -DST_ID=avocadodb -REPO=git://github.com/triAGENS/AvocadoDB.git - -# defaults -BASE_DIR=$(HOME)/_build/$(DST_ID) -DST_DIR=/usr/local/_build/$(DST_ID) - -DB_DIR=/tmp/vocabase -PIDFILE=$(DST_DIR)/app.pid -LOGFILE=$(DST_DIR)/output.log -HISTORY=$(BASE_DIR)/latest-build-hash -LAST_BUILT_COMMIT=$(shell cat $(HISTORY)) -LAST_COMMIT=$(shell git ls-remote $(REPO) | head -n 1 | awk '{print $$1}') - -.PHONY: install update clone configure build all stop start - -clone: -cd `dirname $(BASE_DIR)` && \ -git clone $(REPO) $(DST_ID) || echo "Project already clonned" - -update: -cd $(BASE_DIR) && \ -git pull $(REPO) - -@echo Checking for updated HEAD $(LAST_COMMIT) -if [[ "$(LAST_COMMIT)" == "$(LAST_BUILT_COMMIT)" ]]; then exit 1; fi - -echo "$(LAST_COMMIT)" > $(HISTORY) -configure: -cd $(BASE_DIR) && ./configure --prefix=$(DST_DIR) - -build: -cd $(BASE_DIR) && make - -install: -cd $(BASE_DIR) && make install -cd $(BASE_DIR) && make clean - -start: -@echo Cleaning up -[ -d "$(DB_DIR)" ] && rm -rf $(DB_DIR) || echo "Directory $(DB_DIR) already cleaned up" -mkdir $(DB_DIR) - -@echo Starting... -bash -c '$(DST_DIR)/sbin/avocado $(DB_DIR) 1> $(LOGFILE) & echo $$! > $(PIDFILE) &' -@echo Started -@echo DB Dir: $(DB_DIR) -@echo Logs are in $(LOGFILE) -@echo PID File in $(PIDFILE) - -stop: -kill `cat $(PIDFILE)` -@echo Stopped - -all: clone update configure build install diff --git a/Installation/Debian/postinst b/Installation/Debian/postinst index 3ed99d97d9..9641e2cd78 100755 --- a/Installation/Debian/postinst +++ b/Installation/Debian/postinst @@ -3,7 +3,7 @@ update-rc.d arangodb start 99 2 3 4 5 . stop 00 0 1 6 . >/dev/null /etc/init.d/arangodb start echo " -ArangoDB (http://www.arangodb.org) +ArangoDB 2 (http://www.arangodb.org) A multi-purpose open-source database with a flexible data model for documents, graphs, and key-values. diff --git a/Installation/Debian/prerm b/Installation/Debian/prerm index f01a2a7dec..f551d37a41 100755 --- a/Installation/Debian/prerm +++ b/Installation/Debian/prerm @@ -1,4 +1,3 @@ #!/bin/sh /etc/init.d/arangodb stop - diff --git a/Installation/Debian/rc.arangodb b/Installation/Debian/rc.arangodb index df3d9d6139..1d0cbee1c5 100755 --- a/Installation/Debian/rc.arangodb +++ b/Installation/Debian/rc.arangodb @@ -100,4 +100,3 @@ case "$1" in esac exit 0 - diff --git a/Installation/MacOSX/org.arangodb.plist b/Installation/MacOSX/org.arangodb.plist deleted file mode 100644 index 61529446f3..0000000000 --- a/Installation/MacOSX/org.arangodb.plist +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Disabled - - - Label - org.arangodb - - ProgramArguments - - @BINARY@ - -c - @CONFIGDIR@/arangod.conf - - - RunAtLoad - - - diff --git a/Installation/OBS/clean-repo.sh b/Installation/OBS/clean-repo.sh deleted file mode 100755 index 1b9f50d1ec..0000000000 --- a/Installation/OBS/clean-repo.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -rm -f 'download/robots.txt' - -test -d stable || mkdir stable || exit 1 - -mv download/repositories/home:/fceller/* stable || exit 1 - -rm -rf 'download' -rm -rf 'stable/xUbuntu_10.04' -rm -rf 'stable/CentOS_CentOS-5' -rm -rf 'stable/RedHat_RHEL-5' -rm -rf 'stable/SLE_10_SDK' - -find stable -name "index.html*" -exec 'rm' '{}' ';' -find stable -name "home:fceller.repo*" -exec 'rm' '{}' ';' -find stable -name "*.meta4" -exec 'rm' '{}' ';' -find stable -name "*.metalink" -exec 'rm' '{}' ';' -find stable -name "*.mirrorlist" -exec 'rm' '{}' ';' -find stable -name "repocache" -prune -exec 'rmdir' '{}' ';' diff --git a/Installation/OBS/create-repo.sh b/Installation/OBS/create-repo.sh deleted file mode 100755 index 651e9f6cc4..0000000000 --- a/Installation/OBS/create-repo.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -DISTROS="CentOS_CentOS-6 Fedora_16 Fedora_17 openSUSE_11.4 openSUSE_12.1 openSUSE_12.2 openSUSE_Factory openSUSE_Tumbleweed RedHat_RHEL-6 SLE_11 SLE_11_SP1 SLE_11_SP2" - -test -d stable || mkdir stable || exit 1 - -for distro in $DISTROS; do - tag=`echo $distro | sed -e 's/openSUSE_/openSUSE:/' | sed -e 's/SLE_11/SUSE:SLE_11/' | sed -e 's/SLE_11_/SLE_11:/'` - test -d stable/$distro || mkdir stable/$distro || exit 1 - - echo "[arangodb] -name=ArangoDB Project ($tag) -type=rpm-md -baseurl=http://www.arangodb.org/repositories/stable/$distro/ -gpgcheck=1 -gpgkey=http://www.arangodb.org/repositories/stable/$distro/repodata/repomd.xml.key -enabled=1" > stable/$distro/arangodb.repo - -done diff --git a/Installation/OBS/create-ymp.sh b/Installation/OBS/create-ymp.sh deleted file mode 100755 index 14665308a6..0000000000 --- a/Installation/OBS/create-ymp.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -DISTROS="openSUSE_Tumbleweed openSUSE_Factory openSUSE_12.2 openSUSE_12.1 openSUSE_11.4 SLE_11_SP2 SLE_11_SP1 SLE_11" - -test -d stable || mkdir stable || exit 1 -test -d stable/ymp || mkdir stable/ymp || exit 1 - -for distro in $DISTROS; do - tag=`echo $distro | sed -e 's/openSUSE_/openSUSE:/' | sed -e 's/SLE_11/SUSE:SLE_11/' | sed -e 's/SLE_11_/SLE_11:/'` - test -d stable/ymp/$distro || mkdir stable/ymp/$distro || exit 1 - - echo " - - - - ArangoDB - ArangoDB Project - ArangoDB Repository for $tag - http://www.arangodb.org/repositories/stable/repositories/$distro/ - - - - - arangodb - An open-source, multi-model NoSQL database - ArangoDB is a durable, reliable, transactional multi-model database. It's key-features are: Schema-free schemata, an integrated application server, flexible data modelling, free index choice, and configurable durability. - -The ArangoDB consists of a server, a separate shell, which allows you to administrate the server, and a set of client API for various languages. - -It is written in C/C++. - - - -" > stable/ymp/$distro/arangodb.ymp - -done diff --git a/Installation/OBS/index.html b/Installation/OBS/index.html deleted file mode 100644 index 2d92e685c1..0000000000 --- a/Installation/OBS/index.html +++ /dev/null @@ -1,556 +0,0 @@ - - - - - - - - -
-

Select Your Operating System

- -
- -
Source - -

Source

-
MacOSX - -

Mac OS X

-
Windows - -

Windows

-
CentOS - -

CentOS

-
Debian - -

Debian

-
Fedora - -

Fedora

-
Mandriva - -

Mandriva

-
-
- -
openSUSE - -

openSUSE

-
RHEL - -

RHEL

-
SLE - -

SLE

-
Ubuntu - -

Ubuntu

-
Livecd - -

Live CD

-
- -
- - - -
- - -
-

Add repository and install manually

- -
-
-

For Ubuntu 12.10 run the following as root:

- 
echo 'deb http://www.arangodb.org/repositories/stable/xUbuntu_12.10/ /' >> /etc/apt/sources.list.d/arangodb.list
-apt-get update
-apt-get install arangodb
-

You can add the repository key to apt like this:

- 
wget http://www.arangodb.org/repositories/stable/xUbuntu_12.10/Release.key
-apt-key add - < Release.key
-
-
-

For Ubuntu 12.04 run the following as root:

- 
echo 'deb http://www.arangodb.org/repositories/stable/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/arangodb.list
-apt-get update
-apt-get install arangodb
-

You can add the repository key to apt like this:

- 
wget http://www.arangodb.org/repositories/stable/xUbuntu_12.04/Release.key
-apt-key add - < Release.key
-
-
-

For Ubuntu 11.10 run the following as root:

- 
echo 'deb http://www.arangodb.org/repositories/stable/xUbuntu_11.10/ /' >> /etc/apt/sources.list.d/arangodb.list
-apt-get update
-apt-get install arangodb
-

You can add the repository key to apt like this:

- 
wget http://www.arangodb.org/repositories/stable/xUbuntu_11.10/Release.key
-apt-key add - < Release.key
-
-
-

For Ubuntu 11.04 run the following as root:

- 
echo 'deb http://www.arangodb.org/repositories/stable/xUbuntu_11.04/ /' >> /etc/apt/sources.list.d/arangodb.list
-apt-get update
-apt-get install arangodb
-

You can add the repository key to apt like this:

- 
wget http://www.arangodb.org/repositories/stable/xUbuntu_11.04/Release.key
-apt-key add - < Release.key
-
-
-

For openSUSE Tumbleweed run the following as root:

- 
zypper addrepo http://www.arangodb.org/repositories/stable/openSUSE_Tumbleweed/arangodb.repo
-zypper refresh
-zypper install arangodb
-
-
-

For openSUSE Factory run the following as root:

- 
zypper addrepo http://www.arangodb.org/repositories/stable/openSUSE_Factory/arangodb.repo
-zypper refresh
-zypper install arangodb
-
-
-

For openSUSE 12.2 run the following as root:

- 
zypper addrepo http://www.arangodb.org/repositories/stable/openSUSE_12.2/arangodb.repo
-zypper refresh
-zypper install arangodb
-
-
-

For openSUSE 12.1 run the following as root:

- 
zypper addrepo http://www.arangodb.org/repositories/stable/openSUSE_12.1/arangodb.repo
-zypper refresh
-zypper install arangodb
-
-
-

For openSUSE 11.4 run the following as root:

- 
zypper addrepo http://www.arangodb.org/repositories/stable/openSUSE_11.4/arangodb.repo
-zypper refresh
-zypper install arangodb
-
-
-

For SLE 11 SP2 run the following as root:

- 
zypper addrepo http://www.arangodb.org/repositories/stable/SLE_11_SP2/arangodb.repo
-zypper refresh
-zypper install arangodb
-
-
-

For SLE 11 SP1 run the following as root:

- 
zypper addrepo http://www.arangodb.org/repositories/stable/SLE_11_SP1/arangodb.repo
-zypper refresh
-zypper install arangodb
-
-
-

For SLE 11 run the following as root:

- 
zypper addrepo http://www.arangodb.org/repositories/stable/SLE_11/arangodb.repo
-zypper refresh
-zypper install arangodb
-
-
-

For RedHat RHEL-6 run the following as root:

- 
cd /etc/yum.repos.d/
-wget http://www.arangodb.org/repositories/stable/RedHat_RHEL-6/arangodb.repo
-yum install arangodb
-
-
-

For Mandriva 2011 run the following as root:

- 
urpmi.addmedia arangodb http://www.arangodb.org/repositories/stable/Mandriva_2011/
-urpmi.update -a
-urpmi arangodb
-
-
-

For Fedora 17 run the following as root:

- 
cd /etc/yum.repos.d/
-wget http://www.arangodb.org/repositories/stable/Fedora_17/arangodb.repo
-yum install arangodb
-
-
-

For Fedora 16 run the following as root:

- 
cd /etc/yum.repos.d/
-wget http://www.arangodb.org/repositories/stable/Fedora_16/arangodb.repo
-yum install arangodb
-
-
-

For Debian 6.0 run the following as root:

- 
echo 'deb http://www.arangodb.org/repositories/stable/Debian_6.0/ /' >> /etc/apt/sources.list.d/arangodb.list
-apt-get update
-apt-get install arangodb
- -

You can add the repository key to apt like this:

- 
wget http://www.arangodb.org/repositories/stable/Debian_6.0/Release.key
-apt-key add - < Release.key
-
-
-

For CentOS-6 run the following as root:

- 
cd /etc/yum.repos.d/
-wget http://www.arangodb.org/repositories/stable/CentOS_CentOS-6/arangodb.repo
-yum install arangodb
-
-
-

For Mac OS X you can use use homebrew to install ArangoDB. Run the following:

- 
brew install arangodb
-
-
-

A first version of ArangoDB for Windows is available. Please contact us, if you are interested in trying - it. -

-
-
- -
-

Grab binary packages directly

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Packages for Ubuntu 12.10: - -
Packages for Ubuntu 12.04: - -
Packages for Ubuntu 11.10: - -
Packages for Ubuntu 11.04: - -
Packages for openSUSE Tumbleweed: - -
Packages for openSUSE Factory: - -
Packages for openSUSE 12.2: - -
Packages for openSUSE 12.1: - -
Packages for openSUSE 11.4: - -
Packages for SLE 11 SP2: - -
Packages for SLE 11 SP1: - -
Packages for SLE 11: - -
Packages for RedHat RHEL-6: - -
Packages for Mandriva 2011: - -
Packages for Fedora 17: - -
Packages for Fedora 16: - -
Packages for Debian 6.0: - -
Packages for CentOS-6: - -
Packages for Mac OS X: - -
Packages for Windows: -
    -
  • Coming Soon
    • -
-
- -
- -
-
-
- - diff --git a/Installation/OBS/load-repo.sh b/Installation/OBS/load-repo.sh deleted file mode 100755 index 43c3c4b1ba..0000000000 --- a/Installation/OBS/load-repo.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if test "$1" == ""; then - echo "usage: $0 " - exit 1 -fi - -wget -r -np "http://$1/repositories/home:/fceller/" -mv "$1" download diff --git a/Installation/build.sh b/Installation/build.sh deleted file mode 100755 index 0844b014eb..0000000000 --- a/Installation/build.sh +++ /dev/null @@ -1,206 +0,0 @@ -#!/bin/bash - -echo "########################################################" -echo "# build.sh #" -echo "########################################################" -echo - -OPTIONS="--disable-dependency-tracking --disable-relative" -PREFIX="--prefix=/usr --localstatedir=/var --sysconfdir=/etc" -RESULTS="arangod arangosh arangoimp" -USE_ICECC="no" -EXTRA_MAKE_OPTIONS="" - -while [ 0 -lt "$#" ]; do - opt="$1" - shift - - case "$opt" in - --enable-icecc) - USE_ICECC="yes" - ;; - *) - echo "$0: unknown option '$opt'" - echo "usage: " - echo " $0 [option] build project" - echo "options:" - echo " --enable-icecc using icecc for compiling" - echo "" - exit 1 - ;; - esac -done - -. config/detect_distro.sh - -export CPPFLAGS="" -export LDFLAGS="" -export MAKEJ=2 -export LDD_INFO="no" - -HAS_ICECC=$(ps aux | grep -v "grep" | grep iceccd) - -if [ "x$HAS_ICECC" != "x" -a "x$USE_ICECC" == "xyes" ] ; then - export PATH=/usr/lib/icecc/bin/:/opt/icecream/bin/:$PATH - export MAKEJ=14 - - echo "########################################################" - echo "Using ICECC" - echo " PATH=$PATH" - echo "########################################################" -fi - -echo -echo "########################################################" -echo "Building on $TRI_OS_LONG" -echo "########################################################" -echo - -case $TRI_OS_LONG in - - Linux-ArchLinux*) - echo "Using configuration for Arch Linux" - OPTIONS="$OPTIONS --disable-mruby" - LDD_INFO="yes" - ;; - - Linux-CentOS-6*) - echo "Using configuration for Centos" - OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --disable-mruby" - LDD_INFO="yes" - ;; - - Linux-CentOS-5*) - echo "Using configuration for Centos" - OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --disable-mruby" - LDD_INFO="yes" - # bugfix for readline on CentOS 5: - export READLINE_LDFLAGS="-lncurses" - ;; - - Darwin*) - echo "Using configuration for DARWIN" - CPPFLAGS='-isystem /usr/include -isystem /opt/local/include -Wno-deprecated-declarations' - LDFLAGS='-L/usr/lib ' - OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --disable-mruby" - # we need 64 bits - TRI_MACH="x86_64" - X=$(uname -r) - OPTIONS="$OPTIONS --build=x86_64-apple-darwin${X}" - ;; - - Linux-Debian-6*) - echo "Using configuration for Debian" - OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --disable-mruby" - LDD_INFO="yes" - ;; - - Linux-Debian*) - echo "Using configuration for Debian" - OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --disable-mruby" - LDD_INFO="yes" - ;; - - Linux-Fedora*) - echo "Using configuration for Fedora" - OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --disable-all-in-one-icu --disable-mruby " - LDD_INFO="yes" - ;; - - Linux-LinuxMint-13*) - echo "Using configuration for LinuxMint 13" - OPTIONS="$OPTIONS --disable-mruby" - LDD_INFO="yes" - ;; - - Linux-openSUSE-12*) - echo "Using configuration for openSuSE 12.X" - OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --disable-all-in-one-icu --disable-mruby " - LDD_INFO="yes" - ;; - - Linux-openSUSE-11*) - echo "Using configuration for openSuSE 11.X" - OPTIONS="$OPTIONS --disable-mruby" - LDD_INFO="yes" - ;; - - Linux-Ubuntu-*) - echo "Using configuration for Ubuntu" - OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --disable-mruby" - LDD_INFO="yes" - ;; - - *) - echo "Using default configuration" - OPTIONS="$OPTIONS --enable-error-on-warning" - ;; - -esac - -#if [ ! -f configure ] ; then -echo "########################################################" -echo "create configure script:" -echo " make setup" -echo "########################################################" -echo - -make setup || exit 1 -#fi - -echo -echo "########################################################" -echo "CPPFLAGS: $CPPFLAGS" -echo "LDFLAGS: $LDFLAGS" -echo "OPTIONS: $OPTIONS" -echo "########################################################" -echo -echo "########################################################" -echo "configure:" -echo " ./configure $PREFIX $OPTIONS" -echo "########################################################" -echo - -./configure $PREFIX $OPTIONS || exit 1 - -# bugfix for readline on CentOS 5: -unset LIBS - -echo -echo "########################################################" -echo "compile:" -echo " make -j $MAKEJ " -echo "########################################################" -echo - -make -j $MAKEJ || exit 1 - -for result in $RESULTS; do - echo - echo "########################################################" - echo "$result" - echo "########################################################" - echo - - ident "bin/$result" - - if test "x$LDD_INFO" = "xyes"; then - echo - ldd "bin/$result" - echo - fi -done - - -echo -echo "########################################################" -echo "create man pages:" -echo " make man " -echo "########################################################" -echo - -mkdir Doxygen/man > /dev/null 2>&1 -mkdir Doxygen/man/man1 > /dev/null 2>&1 -mkdir Doxygen/man/man8 > /dev/null 2>&1 - -make man diff --git a/Installation/coverage.sh b/Installation/coverage.sh deleted file mode 100755 index 1bce6151c6..0000000000 --- a/Installation/coverage.sh +++ /dev/null @@ -1,149 +0,0 @@ -#!/bin/bash - -echo "########################################################" -echo "# build.sh #" -echo "########################################################" - -. config/detect_distro.sh - -OPTIONS="--disable-dependency-tracking --disable-relative --enable-gcov" -PREFIX="--prefix=/usr --sysconfdir=/etc" -RESULTS="arangod arangosh" - -export CPPFLAGS="" -export LDFLAGS="" -export MAKEJ="-j 2" -export LDD_INFO="no" - -echo -echo "########################################################" -echo "Building on $TRI_OS_LONG" -echo "########################################################" -echo - -case $TRI_OS_LONG in - - Linux-openSUSE-11.4*) - echo "Using configuration for openSuSE 11.4" - OPTIONS="$OPTIONS --enable-all-in-one" - LDD_INFO="yes" - ;; - - Linux-openSUSE-11*) - echo "Using configuration for openSuSE 11" - OPTIONS="$OPTIONS --enable-all-in-one" - VALGRIND_TEST="yes" - LDD_INFO="yes" - ;; - - Linux-Debian-6*) - echo "Using configuration for Debian" - OPTIONS="$OPTIONS --enable-all-in-one" - LDD_INFO="yes" - ;; - - Linux-Debian*) - echo "Using configuration for Debian" - OPTIONS="$OPTIONS --enable-all-in-one" - LDD_INFO="yes" - ;; - - Linux-CentOS-*) - echo "Using configuration for Centos" - LDD_INFO="yes" - ;; - - Linux-Ubuntu-11.10*) - echo "Using configuration for Ubuntu" - OPTIONS="$OPTIONS --enable-all-in-one" - LDD_INFO="yes" - ;; - - Linux-Ubuntu-*) - echo "Using configuration for Ubuntu" - OPTIONS="$OPTIONS --enable-all-in-one" - LDD_INFO="yes" - ;; - - Darwin*) - echo "Using configuration for DARWIN" - CPPFLAGS='-isystem /usr/include -isystem /opt/local/include -Wno-deprecated-declarations' - LDFLAGS='-L/usr/lib -L/opt/local/lib' # need to use OpenSSL from system - OPTIONS="$OPTIONS --enable-all-in-one" - ;; - - *) - echo "Using default configuration" - OPTIONS="$OPTIONS --enable-error-on-warning" - ;; - -esac - -echo -echo "########################################################" -echo "CPPFLAGS: $CPPFLAGS" -echo "LDFLAGS: $LDFLAGS" -echo "OPTIONS: $OPTIONS" -echo "########################################################" -echo -echo "########################################################" -echo "init system:" -echo " make setup" -echo "########################################################" -echo - -make setup || exit 1 - -echo -echo "########################################################" -echo "configure:" -echo " ./configure $PREFIX $OPTIONS" -echo "########################################################" -echo - -./configure $PREFIX $OPTIONS || exit 1 - -echo -echo "########################################################" -echo "compile:" -echo " make $MAKEJ" -echo "########################################################" -echo - -make $MAKEJ || exit 1 - -echo -echo "########################################################" -echo "unittests:" -echo " make unittests" -echo "########################################################" -echo - -make unittests FORCE=1 || exit 1 - -echo -echo "########################################################" -echo "lcov:" -echo "########################################################" -echo - -rm -rf COVERAGE -mkdir COVERAGE -mkdir COVERAGE/html - -current=`pwd` -vprj_folder=`basename $current` -lcov_folder="${vprj_folder}/COVERAGE/html" -c_info_file="${vprj_folder}/COVERAGE/coverage.lcov" -r_info_file="${vprj_folder}/COVERAGE/reduced.lcov" - -( - cd .. - lcov -b ${vprj_folder} -c -d ${vprj_folder} -o ${c_info_file}.1 - lcov --remove ${c_info_file}.1 "*3rdParty*" -o ${c_info_file}.2 - rm ${c_info_file}.1 - lcov --remove ${c_info_file}.2 "*UnitTests*" -o ${c_info_file} - rm ${c_info_file}.2 - lcov --extract ${c_info_file} "*${vprj_folder}*" -o ${r_info_file} - genhtml -o ${lcov_folder} ${r_info_file} -) diff --git a/Installation/epm/arangodb.list b/Installation/epm/arangodb.list deleted file mode 100644 index 289ccdfc81..0000000000 --- a/Installation/epm/arangodb.list +++ /dev/null @@ -1,225 +0,0 @@ -################################################################################ -## epm configuration file -## Documentation: http://www.epmhome.org -################################################################################ - -$version=${arangodb_version} -$release=${arangodb_release} - -################################################################################ -## ArangoDB -################################################################################ - -%product ArangoDB -%copyright 2012 by triAGENS GmbH -%vendor triAGENS GmbH -%license ${project_dir}/LICENSE -%readme ${project_dir}/README -%description ArangoDB is a durable, reliable, transactional multi-model database. It's key-features are: Schema-free schemata, an integrated application server, flexible data modelling, free index choice, and configurable durability. -%version ${version} -%release ${release} - -################################################################################ -## File List -################################################################################ - -d 0755 ${susr} ${sgrp} /etc/arangodb - -d 0755 ${susr} ${sgrp} /etc/arangodb/ - -c 0644 ${susr} ${sgrp} /etc/arangodb/arangosh.conf ${project_dir}/etc/arangodb/arangosh.conf - -f 0755 ${susr} ${sgrp} ${sbindir}/arangod-${arangodb_version} ${project_dir}/bin/arangod -l 000 ${rusr} ${rgrp} ${sbindir}/arangod ${sbindir}/arangod-${arangodb_version} - -f 0755 ${susr} ${sgrp} ${bindir}/arangoimp ${project_dir}/bin/arangoimp -f 0755 ${susr} ${sgrp} ${bindir}/arangosh ${project_dir}/bin/arangosh - -# database directory -d 0755 ${rusr} ${rgrp} ${data_dir} - -d 0755 ${susr} ${sgrp} ${data_dir}/arangodb - - -# static files -d 0755 ${susr} ${sgrp} ${static_dir} - -d 0755 ${susr} ${sgrp} ${static_dir}/arangodb - -d 0755 ${susr} ${sgrp} ${static_dir}/arangodb/js - -d 0755 ${susr} ${sgrp} ${static_dir}/arangodb/html - - -# PID file directory -d 0755 ${susr} ${sgrp} /var/run/arangodb - - -# logfile directory -d 0755 ${susr} ${sgrp} /var/log/arangodb - - -d 0755 ${rusr} ${rgrp} ${mandir} - -d 0755 ${rusr} ${rgrp} ${mandir}/man1 - -d 0755 ${rusr} ${rgrp} ${mandir}/man8 - - -%include ${project_dir}/Installation/epm/arangodb.sublist - -################################################################################ -## Pre/Post Install -################################################################################ - -## ----------------------------------------------------------------------------- -## MAC OS X -## ----------------------------------------------------------------------------- - -%ifdef macosx -c 0644 ${susr} ${sgrp} /etc/arangodb/arangod.conf ${project_dir}/etc/arangodb/arangod.conf -d 0755 ${rusr} ${rgrp} /Library/LaunchDaemons/ - -f 0755 ${rusr} ${rgrp} /Library/LaunchDaemons/org.arangodb.plist.template ${project_dir}/Installation/MacOSX/org.arangodb.plist -%postinstall < /Library/LaunchDaemons/org.arangodb.plist -launchctl unload /Library/LaunchDaemons/org.arangodb.plist - -# change user of 1.0 version -/usr/sbin/chown -R ${susr}:${sgrp} /var/run/arangodb -/usr/sbin/chown -R ${susr}:${sgrp} /var/log/arangodb -/usr/sbin/chown -R ${susr}:${sgrp} ${data_dir}/arangodb - -launchctl load /Library/LaunchDaemons/org.arangodb.plist - -EOF - -%preremove </dev/null || groupadd -r arangodb -getent passwd arangodb >/dev/null || useradd -r -g arangodb -d ${static_dir}/arangodb -s /bin/false -c "ArangoDB Application User" arangodb -EOF -%endif - -## ----------------------------------------------------------------------------- -## CHKCONF -## ----------------------------------------------------------------------------- - -%ifdef chkconf -f 0755 ${rusr} ${rgrp} ${initdir}/arangodb ${project_dir}/Installation/Linux/${START_SCRIPT} - -%postinstall <1 > /dev/null || true -chkconfig --del arangodb -exit 0 -EOF - -## ----------------------------------------------------------------------------- -## INSSERV -## ----------------------------------------------------------------------------- - -%elseifdef insserv -f 0755 ${rusr} ${rgrp} ${initdir}/arangodb ${project_dir}/Installation/Linux/${START_SCRIPT} - -%postinstall <1 > /dev/null - -# change user of 1.0 version -chown -R ${susr}:${sgrp} /var/run/arangodb -chown -R ${susr}:${sgrp} /var/log/arangodb -chown -R ${susr}:${sgrp} ${data_dir}/arangodb - -echo "${install_message}" - -exit 0 -EOF - -%preremove <1 > /dev/null || true -test -x /sbin/insserv && /sbin/insserv -r /etc/init.d/arangodb 2&>1 > /dev/null -exit 0 -EOF - -## ----------------------------------------------------------------------------- -## use_systemd -## ----------------------------------------------------------------------------- - -%elseifdef use_systemd -f 0544 ${rusr} ${rgrp} ${systemddir}/arangodb.service ${project_dir}/etc/systemd/arangodb.service - -%postinstall < /dev/null 2>&1 -/bin/systemctl preset arangodb.service > /dev/null 2>&1 - -# change user of 1.0 version -chown -R ${susr}:${sgrp} /var/run/arangodb -chown -R ${susr}:${sgrp} /var/log/arangodb -chown -R ${susr}:${sgrp} ${data_dir}/arangodb - -echo "${install_message}" - -exit 0 -EOF - -%preremove < /dev/null 2>&1 || : - /bin/systemctl stop arangodb.service > /dev/null 2>&1 || : -fi -exit 0 -EOF - -%postremove </dev/null 2>&1 || : -else # package uninstall - for service in arangodb.service ; do - sysv_service=$${service%.*} - rm -f "/var/lib/systemd/migrated/$$sysv_service" 2> /dev/null || : - done - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi -EOF - -## ----------------------------------------------------------------------------- -## EPM -## ----------------------------------------------------------------------------- - -%else - -%system linux -i 0755 ${rusr} ${rgrp} arangodb ${project_dir}/Installation/Linux/${START_SCRIPT} runlevel(${runlevels}) - -%postinstall <> ${SUBLIST} - mkepmlist -u ${susr} -g ${sgrp} --prefix ${mandir}/man8 ${sfolder_name}/Doxygen/man/man8/*.8 >> ${SUBLIST} - mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/js ${sfolder_name}/js >> ${SUBLIST} - -echo "########################################################" -echo - -## -## build install/help message -## - -cd ${hudson_base} -sudo -E rm -rf ${hudson_base}/${archfolder} -sudo -E mkdir -p ${hudson_base}/${archfolder} -sudo -E mkdir -p ${hudson_base}/${archfolder}/BUILD -sudo -E mkdir -p ${hudson_base}/${archfolder}/buildroot - -echo -echo "########################################################" -echo "Export vars for epm" -echo " export arangodb_release=$arangodb_release" -echo " export arangodb_version=$arangodb_version" -echo " export bindir=$bindir" -echo " export chkconf=$chkconf" -echo " export data_dir=$data_dir" -echo " export docdir=$docdir" -echo " export exec_prefix=$exec_prefix" -echo " export initdir=$initdir" -echo " export insserv=$insserv" -echo " export prefix=$prefix" -echo " export project_dir=${sfolder_name}" -echo " export rgrp=$rgrp" -echo " export runlevels=$runlevels" -echo " export rusr=$rusr" -echo " export sbindir=$sbindir" -echo " export sgrp=$sgrp" -echo " export static_dir=$static_dir" -echo " export mandir=$mandir" -echo " export susr=$susr" -echo " export vers_dir=$vers_dir" -echo " export START_SCRIPT=$START_SCRIPT" -echo " export systemddir=$systemddir" -echo "########################################################" -echo - -export arangodb_release -export arangodb_version -export bindir -export data_dir -export docdir -export exec_prefix -export initdir -export prefix -export project_dir=${sfolder_name} -export rgrp -export runlevels -export rusr -export sbindir -export sgrp -export static_dir -export susr -export vers_dir -export START_SCRIPT -export install_message -export mandir -export systemddir - -echo -echo "########################################################" -echo "Call EPM to build the package." -echo " sudo -E epm -v -a ${TRI_MACH} -f ${package_type} ${product_name} ${sfolder_name}/${LIST}" -sudo -E epm -v -a ${TRI_MACH} -f ${package_type} ${product_name} ${sfolder_name}/${LIST} || exit 1 -echo "########################################################" -echo - -if [ ${package_type} == "osx" ] ; then - package_type="dmg" -fi - -package_name="$product_name-$arangodb_version-$arangodb_release-$TRI_DIST-$TRI_RELEASE-$TRI_MACH.$package_type" - -# Delete old package in hudson's home folder. -rm -f ${hudson_base}/${package_name} > /dev/null - -echo -echo "########################################################" -echo "Copy package '${product_name}*.${package_type}' to '${package_name}'." -echo " cp -p ${hudson_base}/${archfolder}/${product_name}*.${package_type} ${sfolder_name}/${package_name}" -cp -p ${hudson_base}/${archfolder}/${product_name}*.${package_type} ${sfolder_name}/${package_name} -echo "########################################################" -echo - -start_server= -stop_server= -install_package= -remove_package= -mount_install_package= -unmount_install_package= - -case $TRI_OS_LONG in - - Linux-openSUSE-12*) - start_server="sudo systemctl start arangodb.service" - stop_server="sudo systemctl stop arangodb.service" - - install_package="sudo rpm -i ${sfolder_name}/${package_name}" - remove_package="sudo rpm -e $product_name" - - ;; - - Linux-openSUSE*) - start_server="sudo /etc/init.d/arangodb start" - stop_server="sudo /etc/init.d/arangodb stop" - - install_package="sudo rpm -i ${sfolder_name}/${package_name}" - remove_package="sudo rpm -e $product_name" - - ;; - - Linux-Debian*) - start_server="sudo /etc/init.d/arangodb start" - stop_server="sudo /etc/init.d/arangodb stop" - - install_package="sudo dpkg -i ${sfolder_name}/${package_name}" - remove_package="sudo dpkg --purge $product_name" - ;; - - Linux-CentOS-*) - start_server="sudo /etc/init.d/arangodb start" - stop_server="sudo /etc/init.d/arangodb stop" - - install_package="sudo rpm -i ${sfolder_name}/${package_name}" - remove_package="sudo rpm -e $product_name" - ;; - - Linux-Ubuntu-*) - start_server="sudo /etc/init.d/arangodb start" - stop_server="sudo /etc/init.d/arangodb stop" - - install_package="sudo dpkg -i ${sfolder_name}/${package_name}" - remove_package="sudo dpkg --purge $product_name" - ;; - - Linux-LinuxMint-*) - start_server="sudo /etc/init.d/arangodb start" - stop_server="sudo /etc/init.d/arangodb stop" - - install_package="sudo dpkg -i ${sfolder_name}/${package_name}" - remove_package="sudo dpkg --purge $product_name" - ;; - - Darwin*) - start_server="" - stop_server="sudo launchctl unload /Library/LaunchDaemons/org.arangodb.plist" - - install_package="sudo installer -pkg /Volumes/${product_name}/${product_name}.pkg -target / " - remove_package="sudo rm /Library/LaunchDaemons/org.arangodb.plist*" - - mount_install_package="hdiutil attach ${sfolder_name}/${package_name}" - unmount_install_package="hdiutil detach /Volumes/${product_name}" - ;; - - *) - ;; - -esac - -echo -echo "########################################################" -echo " INSTALL TEST " -echo "########################################################" -echo "Stop and uninstall server" - -# stop and uninstall server -if [ "${stop_server}x" != "x" ]; then - echo " $stop_server" - $stop_server -fi - -if [ "${remove_package}x" != "x" ]; then - echo " $remove_package" - $remove_package -fi - -if [ "${unmount_install_package}x" != "x" ]; then - echo " $unmount_install_package" - $unmount_install_package -fi - -if [ "${mount_install_package}x" != "x" ]; then - echo " $mount_install_package" - $mount_install_package -fi - -echo -echo "########################################################" -echo "Install" -echo " ${install_package}" -${install_package} || exit 1 -echo "########################################################" - -echo "Successfully installed ${package_name}." -echo "########################################################" - -if [ "${start_server}x" != "x" ]; then -echo "Start" -echo " ${start_server}" -${start_server} -echo "########################################################" -fi - -echo "Check process" -process=$(ps aux | grep arangod | grep -v grep) -echo "$process" - -echo "Wait for server..." -echo " sleep 10" -sleep 10 - -echo -echo "########################################################" -echo "Request version number " -echo " $curl_version" -answer=$( $curl_version ) -answer=`echo "$answer" | tr -d "-"` # remove "-" from version string for comparison -expect='{"server":"arango","version":"'$arangodb_version.$arangodb_release'"}' -if [ "x$answer" == "x$expect" ]; then - echo "ok: $answer" -else - echo "error: $answer != $expect" - sudo tail -50 /var/log/arangodb/arangod.log -fi -echo "########################################################" -echo - -echo -echo "########################################################" -if [ "${stop_server}x" != "x" ]; then -echo "Stop" -echo " $stop_server" -$stop_server || exit 1 -echo "########################################################" -fi -if [ "${remove_package}x" != "x" ]; then -echo "Uninstall" -echo " $remove_package" -$remove_package || exit 1 -echo "########################################################" -echo "Successfully uninstalled ${product_name}." -echo "########################################################" -fi -echo - -if [ "${unmount_install_package}x" != "x" ]; then - $unmount_install_package > /dev/null 2>&1 -fi - -if [ "x$answer" == "x$expect" ]; then - exit 0 -else - exit 1 -fi diff --git a/Installation/unittests.sh b/Installation/unittests.sh deleted file mode 100755 index 3ef98b20da..0000000000 --- a/Installation/unittests.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "########################################################" -echo "# build.sh #" -echo "########################################################" -echo - -. config/detect_distro.sh - -export VALGRIND_TEST="no" -export RSPEC_AVAILABLE="yes" - -echo -echo "########################################################" -echo "Building on $TRI_OS_LONG" -echo "########################################################" -echo - -case $TRI_OS_LONG in - - Linux-openSUSE-11.4*) - echo "Using configuration for openSuSE 11.4" - ;; - - Linux-openSUSE-11*) - echo "Using configuration for openSuSE 11" - VALGRIND_TEST="yes" - ;; - - Linux-Debian-6*) - echo "Using configuration for Debian" - ;; - - Linux-Debian*) - echo "Using configuration for Debian" - RSPEC_AVAILABLE="no" - ;; - - Linux-CentOS-*) - echo "Using configuration for Centos" - RSPEC_AVAILABLE="no" - ;; - - Linux-Ubuntu-11.10*) - echo "Using configuration for Ubuntu" - ;; - - Linux-Ubuntu-*) - echo "Using configuration for Ubuntu" - ;; - - Darwin*) - echo "Using configuration for DARWIN" - ;; - - *) - echo "Using default configuration" - ;; - -esac - -while [ $? -ne 0 ]; do - if [ "$1" == "--valgrind" ]; then - VALGRIND_TEST="yes" - elif [ "$1" == "--no-valgrind" ]; then - VALGRIND_TEST="no" - elif [ "$1" == "--resc" ]; then - RSPEC_AVAILABLE="yes" - elif [ "$1" == "--no-resc" ]; then - RSPEC_AVAILABLE="no" - fi - - shift -done - -echo -echo "########################################################" -echo "unittests:" -echo " make unittests" -echo "########################################################" -echo - -echo "VALGRIND: $VALGRIND_TEST" -echo "RSPEC: $RSPEC_AVAILABLE" - -make unittests-boost || exit 1 -make unittests-shell-server || exit 1 -make unittests-shell-server-ahuacatl || exit 1 - -if test "x$RSPEC_AVAILABLE" = "xyes"; then - make unittests-http-server || exit 1 -fi - -make unittests-shell-client || exit 1 - -if test "x$VALGRIND_TEST" = "xyes"; then - echo - echo "########################################################" - echo "unittests with VALGRIND:" - echo " make unittests VALGRIND=valgrind --leak-check=full" - echo "########################################################" - echo - - make unittests VALGRIND="valgrind --suppressions=RestServer/arango.supp --leak-check=full" || exit 1 -fi diff --git a/Makefile.am b/Makefile.am index 8476e7b159..afa223ce1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -512,7 +512,9 @@ include 3rdParty/Makefile.zlib ### @brief etcd ################################################################################ +if ENABLE_ALL_IN_ONE_ETCD include 3rdParty/Makefile.etcd +endif ## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE diff --git a/UPGRADING b/UPGRADING index aeb496e4bb..c412234e8d 100644 --- a/UPGRADING +++ b/UPGRADING @@ -1 +1 @@ -Please refer to Documentation/Manual/Upgrading14.md +Please refer to Documentation/Manual/Upgrading20.md diff --git a/js/common/modules/engine b/js/common/modules/engine deleted file mode 120000 index 8e83a2ef6c..0000000000 --- a/js/common/modules/engine +++ /dev/null @@ -1 +0,0 @@ -../../devs/databases/_system/foxx-tank/engine \ No newline at end of file