Skip to content

Commit

Permalink
[build] Hue2 does not rely on crepo
Browse files Browse the repository at this point in the history
We used to crepo in external libraries from mootools and jframe.
Hue2 doesn't use them.
  • Loading branch information
bc Wong committed Apr 6, 2012
1 parent 002262f commit 8229c95
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 47 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ ext/thirdparty/js/jframe/

# Make product
desktop/core/ext-py/lxml/src/lxml/lxml-version.h
/VERSION_DATA

# Common "beeswaxd" product
/metastore_db
Expand Down
41 changes: 6 additions & 35 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
# ==========
# Here we summarize the flow of the build logic. Lines represent dependency.
#
# virtual-bootstrap.py
# | ext/thirdparty/js (crepo sync)
# virtual-env (./env) |
# | |
# '--------+----------+---------------'
# virtual-bootstrap.py
# |
# virtual-env (./env)
# |
# +----------+
# | |
# | V
# | desktop <--- recursive make in /desktop
Expand Down Expand Up @@ -84,13 +84,6 @@ include $(ROOT)/Makefile.vars.priv
# Error checking
###################################

# <<<< DEV ONLY
CREPO ?= $(shell which crepo 2> /dev/null)
ifeq ($(CREPO),)
$(error "Error: Need crepo. See <http://github.com/cloudera/crepo>.")
endif
# END DEV ONLY >>>>


.PHONY: default
default:
Expand All @@ -102,7 +95,6 @@ default:
@echo ' distclean : Remove desktop and thirdparty build products'
# <<<< DEV ONLY
@echo ' docs : Build documentation'
@echo ' crepo : Update crepo'
@echo ' prod : Generate a tar file for production distribution'
# END DEV ONLY >>>>

Expand All @@ -118,24 +110,6 @@ include Makefile.tarball
.PHONY: docs
docs:
@$(MAKE) -C docs

###################################
# Crepo
###################################

# Development use crepo to fetch thirdparty dependencies.

.PHONY: crepo
crepo: $(THIRDPARTY_JS_DIR)/manifest.json $(THIRDPARTY_JS_DIR)/*.hash
@echo "--- Synchronizing external dependencies with crepo"
@# Do crepo sync iff not NOCREPO
@if [ -n "$(NOCREPO)" ] ; then \
echo ' ---- Skipping crepo sync (NOCREPO is set)' ; \
else \
mkdir -p $(BLD_DIR); \
cd $(THIRDPARTY_JS_DIR) && $(CREPO) sync && \
($(CREPO) dump-refs > $(ROOT)/VERSION_DATA || true) ; \
fi
# END DEV ONLY >>>>

###################################
Expand Down Expand Up @@ -165,7 +139,7 @@ $(BLD_DIR_ENV)/stamp:
.PHONY: desktop

# <<<< DEV ONLY
desktop: crepo parent-pom
desktop: parent-pom
# END DEV ONLY >>>>
desktop: virtual-env
@$(MAKE) -C desktop
Expand Down Expand Up @@ -243,9 +217,6 @@ clean:
@$(MAKE) -C apps clean
# <<<< DEV ONLY
@$(MAKE) -C docs clean
@echo "Removing dependencies managed by crepo"
@cd $(THIRDPARTY_JS_DIR) && $(CREPO) do-all -x clean -f -x -d
@rm -f VERSION_DATA
# END DEV ONLY >>>>

#
Expand Down
5 changes: 2 additions & 3 deletions Makefile.tarball
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ PROD_INCLUDES := \
tools/app_reg \
tools/virtual-bootstrap \
tools/relocatable.sh \
VERSION \
VERSION_DATA
VERSION

# Check for things in BDIST_EXCLUDES in various apps
PROD_EXCLUDES := \
Expand Down Expand Up @@ -76,7 +75,7 @@ $(BLD_DIR_PROD_TGZ): $(BLD_DIR_PROD)
@echo "--- Generated $(BLD_DIR_PROD_TGZ)"

.PHONY: $(BLD_DIR_PROD)
$(BLD_DIR_PROD): apps crepo docs
$(BLD_DIR_PROD): apps docs
@echo "--- Preparing general distribution tree at $@"
@rm -rf $@
@mkdir -p $@
Expand Down
11 changes: 3 additions & 8 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ namespace. See ``apps/hello/src/hello/urls.py`` for an example.

Development Prerequisites
===========================
1. Also, you'll need these library development packages and tools installed on
your system:
You'll need these library development packages and tools installed on
your system:

Debian:
* ant
Expand Down Expand Up @@ -84,7 +84,7 @@ Development Prerequisites
* mysql-devel
* openldap-devel
* python-devel
* python-simplejson (for the crepo tool)
* python-simplejson
* sqlite-devel

MacOS (mac port):
Expand All @@ -95,11 +95,6 @@ Development Prerequisites
* simplejson (easy_install)
* sqlite3

2. You need to have crepo installed, and preferably on your path. If it is not
on your path, set the environment variable ``CREPO`` to point to ``crepo.py``
from that distribution. You can clone crepo from
http://github.com/cloudera/crepo.git somewhere else on your system.


Getting Started
===============
Expand Down

0 comments on commit 8229c95

Please sign in to comment.