Просмотр исходного кода

[build] Hue2 does not rely on crepo

We used to crepo in external libraries from mootools and jframe.
Hue2 doesn't use them.
bc Wong 13 лет назад
Родитель
Сommit
8229c9566a
4 измененных файлов с 11 добавлено и 47 удалено
  1. 0 1
      .gitignore
  2. 6 35
      Makefile
  3. 2 3
      Makefile.tarball
  4. 3 8
      README.rst

+ 0 - 1
.gitignore

@@ -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

+ 6 - 35
Makefile

@@ -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
@@ -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:
@@ -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 >>>>
 
@@ -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 >>>>
 
 ###################################
@@ -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
@@ -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 >>>>
 
 #

+ 2 - 3
Makefile.tarball

@@ -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 := \
@@ -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 $@

+ 3 - 8
README.rst

@@ -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
@@ -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):
@@ -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
 ===============