Clean up .gitignore and README.md.
Change-Id: I8006c12fd076baf8fedf0775842aade5d05f0d0d
Reviewed-on: https://asterix-gerrit.ics.uci.edu/791
Reviewed-by: Till Westmann <tillw@apache.org>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
diff --git a/.gitignore b/.gitignore
index 8530a4b..6453783 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,18 +12,18 @@
asterix_logs
build
bin
-asterix-app/src/test/resources/externallib/
-asterix-app/rttest/
-asterix-app/mdtest/
-asterix-app/opttest/
-asterix-app/parserts/
-asterix-app/library/
-asterix-app/opt_parserts/
-asterix-app/runtime_parserts/
-asterix-app/data/csv/beer.csv
-asterix-installer/ittest/
-asterix-installer/repliationtest/
-asterix-installer/src/test/resources/clusterts/asterix-installer-0.8.9-SNAPSHOT-binary-assembly/
+asterixdb/asterix-app/src/test/resources/externallib/
+asterixdb/asterix-app/rttest/
+asterixdb/asterix-app/mdtest/
+asterixdb/asterix-app/opttest/
+asterixdb/asterix-app/parserts/
+asterixdb/asterix-app/library/
+asterixdb/asterix-app/opt_parserts/
+asterixdb/asterix-app/runtime_parserts/
+asterixdb/asterix-app/data/csv/beer.csv
+asterixdb/asterix-installer/ittest/
+asterixdb/asterix-installer/repliationtest/
+asterixdb/asterix-installer/src/test/resources/clusterts/asterix-installer-*-SNAPSHOT-binary-assembly/
build
asterix_logs
bin/
diff --git a/asterixdb/README.md b/README.md
similarity index 93%
rename from asterixdb/README.md
rename to README.md
index 688ffea..8dc935a 100644
--- a/asterixdb/README.md
+++ b/README.md
@@ -46,22 +46,13 @@
Instructions for building the master:
-* Checkout Hyracks master:
-
- $git clone https://github.com/apache/incubator-asterixdb-hyracks.git
-
* Checkout AsterixDB master:
$git clone https://github.com/apache/incubator-asterixdb.git
-* Build and install Hyracks master to maven local repo:
-
- $cd hyracks
- $mvn clean install -DskipTests
-
* Build AsterixDB master:
- $cd ../asterixdb
+ $cd incubator-asterixdb
$mvn clean package -DskipTests
@@ -74,7 +65,7 @@
* Copy AsterixDB binary artifact into the installer directory and unzip it:
- $cp asterix-installer/target/asterix-installer-*-binary-assembly.zip ~/managix/
+ $cp asterixdb/asterix-installer/target/asterix-installer-*-binary-assembly.zip ~/managix/
$cd ~/managix
$unzip asterix-installer-*-binary-assembly.zip