Skip to content

Commit

Permalink
HUE-449. tarball build changes after mavenization [part2]
Browse files Browse the repository at this point in the history
* Include java src with distribution
* Fix bdist target to correctly calculate dependency
* Remove unused build.xml and ivy.xml
  • Loading branch information
bc Wong committed Feb 11, 2011
1 parent 7d88aae commit e7e6392
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 524 deletions.
5 changes: 0 additions & 5 deletions Makefile.tarball
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,14 @@ PROD_INCLUDES := \

# Check for things in BDIST_EXCLUDES in various apps
PROD_EXCLUDES := \
apps/beeswax/java \
apps/beeswax/thrift \
apps/hello \
apps/jframegallery \
apps/jobsub/src/jobsub/java \
build \
desktop/conf \
desktop/desktop.db \
desktop/devtools.mk \
desktop/libs/hadoop/java \
desktop/libs/hadoop/regenerate-thrift.sh \
desktop/libs/hadoop/static-group-mapping/src \
desktop/libs/hadoop/sudo-shell/src \
ext/thirdparty/js/manifest.json \
ext/thirdparty/README.md \
Makefile.tarball
Expand Down
5 changes: 1 addition & 4 deletions apps/beeswax/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ clean::
rm -Rf $(BEESWAX_JAVA_LIB)
cd $(BEESWAX_JAVA_DIR) && mvn clean || :

BEESWAX_OPTS := -Dbuild.dir=$(BLD_DIR_BEESWAX) \
-Dhadoop.home=$(HADOOP_HOME) \
-Dhive.lib=$(BEESWAX_HIVE_LIB)
$(BEESWAX): $(shell find $(BEESWAX_JAVA_DIR))
$(BEESWAX): $(shell find $(BEESWAX_JAVA_DIR) -type f)
@echo "--- Building Desktop beeswax"
cd $(BEESWAX_JAVA_DIR) && mvn clean install -DskipTests
@mkdir -p $(BEESWAX_JAVA_LIB)
Expand Down
151 changes: 0 additions & 151 deletions apps/beeswax/java/build.xml

This file was deleted.

23 changes: 0 additions & 23 deletions apps/beeswax/java/ivy.xml

This file was deleted.

18 changes: 3 additions & 15 deletions desktop/libs/hadoop/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,7 @@ compile: $(PLUGIN) $(STATIC_GROUP_MAPPING) $(SUDO_SHELL)

# Build the plugin jar iff the source is present
ifneq (,$(wildcard $(PLUGIN_JAVA_DIR)))
PLUGIN_OPTS := -Dbuild.dir=$(BLD_DIR_PLUGINS) \
-Dhadoop.home=$(HADOOP_HOME) \
-Dplugins.version=$(DESKTOP_VERSION)

$(PLUGIN): $(shell find $(PLUGIN_JAVA_DIR) )
$(PLUGIN): $(shell find $(PLUGIN_JAVA_DIR) -type f)
mkdir -p $(PLUGIN_JAVA_LIB)
@echo "--- Building Hadoop plugins"
cd $(PLUGIN_JAVA_DIR) && mvn clean install -DskipTests
Expand All @@ -81,11 +77,7 @@ endif

# Build the static group mapping jar iff the source is present
ifneq (,$(wildcard $(STATIC_GROUP_MAPPING_SRC)))
STATIC_GROUP_MAPPING_OPTS := -Dbuild.dir=$(STATIC_GROUP_MAPPING_BUILD) \
-Dhadoop.home=$(HADOOP_HOME) \
-Dstatic-group-mapping.version=$(DESKTOP_VERSION)

$(STATIC_GROUP_MAPPING): $(shell find $(STATIC_GROUP_MAPPING_SRC))
$(STATIC_GROUP_MAPPING): $(shell find $(STATIC_GROUP_MAPPING_SRC) -type f)
mkdir -p $(STATIC_GROUP_MAPPING_LIB)
@echo "--- Building static UserGroupMappingService"
cd $(STATIC_GROUP_MAPPING_DIR) && mvn clean install -DskipTests
Expand All @@ -101,11 +93,7 @@ endif

# Build the sudo shell jar iff the source is present
ifneq (,$(wildcard $(SUDO_SHELL_SRC)))
SUDO_SHELL_OPTS := -Dbuild.dir=$(SUDO_SHELL_BUILD) \
-Dhadoop.home=$(HADOOP_HOME) \
-Dsudo-shell.version=$(DESKTOP_VERSION)

$(SUDO_SHELL): $(shell find $(SUDO_SHELL_SRC))
$(SUDO_SHELL): $(shell find $(SUDO_SHELL_SRC) -type f)
mkdir -p $(SUDO_SHELL_LIB)
@echo "--- Building sudo fsshell tool"
cd $(SUDO_SHELL_DIR) && mvn clean install -DskipTests
Expand Down
104 changes: 0 additions & 104 deletions desktop/libs/hadoop/java/build.xml

This file was deleted.

Loading

0 comments on commit e7e6392

Please sign in to comment.