Commit 5ccdd4f9 authored by Marco Mariani's avatar Marco Mariani

jdk-{version} => jdk{version} (name of folder inside jdk archive)

parent b611d846
...@@ -24,7 +24,7 @@ CORE_COMPONENTS := \ ...@@ -24,7 +24,7 @@ CORE_COMPONENTS := \
$(CORE_DEST_DIR)/bin \ $(CORE_DEST_DIR)/bin \
$(CORE_DEST_DIR)/contrib \ $(CORE_DEST_DIR)/contrib \
$(CORE_DEST_DIR)/zimbramon \ $(CORE_DEST_DIR)/zimbramon \
$(CORE_DEST_DIR)/$(JAVA_FILE)-$(JAVA_VERSION) \ $(CORE_DEST_DIR)/$(JAVA_FILE)$(JAVA_VERSION) \
$(CORE_DEST_DIR)/conf \ $(CORE_DEST_DIR)/conf \
$(CORE_DEST_DIR)/docs \ $(CORE_DEST_DIR)/docs \
$(CORE_DEST_DIR)/$(BDB_DIR) \ $(CORE_DEST_DIR)/$(BDB_DIR) \
......
...@@ -10,7 +10,7 @@ core: $(PACKAGE_DIR) core_stage core_pkg_spec_$(PACKAGE_EXT) ...@@ -10,7 +10,7 @@ core: $(PACKAGE_DIR) core_stage core_pkg_spec_$(PACKAGE_EXT)
core_pkg_spec_ccs: core_pkg_spec_ccs:
core_pkg_spec_pkg: $(BUILD_ROOT)/resources/zimbra-core $(BUILD_ROOT)/zimbra-core.Info.plist $(BUILD_ROOT)/zimbra-core.Description.plist core_pkg_spec_pkg: $(BUILD_ROOT)/resources/zimbra-core $(BUILD_ROOT)/zimbra-core.Info.plist $(BUILD_ROOT)/zimbra-core.Description.plist
rm -rf $(CORE_DEST_DIR)/$(JAVA_FILE)-$(JAVA_VERSION) rm -rf $(CORE_DEST_DIR)/$(JAVA_FILE)$(JAVA_VERSION)
$(BUILD_ROOT)/zimbra-core.Description.plist: $(BUILD_ROOT)/zimbra-core.Description.plist:
cat $(PACKAGE_CONF_DIR)/Spec/zimbra-core.Description.plist | \ cat $(PACKAGE_CONF_DIR)/Spec/zimbra-core.Description.plist | \
...@@ -95,7 +95,7 @@ $(BUILD_ROOT)/zimbra-core.spec: ...@@ -95,7 +95,7 @@ $(BUILD_ROOT)/zimbra-core.spec:
$(BUILD_ROOT)/zimbra-core.spec $(BUILD_ROOT)/zimbra-core.spec
echo "%attr(-, zimbra, zimbra) /opt/zimbra/db" >> \ echo "%attr(-, zimbra, zimbra) /opt/zimbra/db" >> \
$(BUILD_ROOT)/zimbra-core.spec $(BUILD_ROOT)/zimbra-core.spec
echo "%attr(-, root, root) /opt/zimbra/jdk-$(JAVA_VERSION)" >> \ echo "%attr(-, root, root) /opt/zimbra/jdk$(JAVA_VERSION)" >> \
$(BUILD_ROOT)/zimbra-core.spec $(BUILD_ROOT)/zimbra-core.spec
echo "%attr(-, root, root) /opt/zimbra/lib" >> \ echo "%attr(-, root, root) /opt/zimbra/lib" >> \
$(BUILD_ROOT)/zimbra-core.spec $(BUILD_ROOT)/zimbra-core.spec
...@@ -220,7 +220,7 @@ $(NATIVE_DIR)/build/libzimbra-native.$(JNI_EXT): ...@@ -220,7 +220,7 @@ $(NATIVE_DIR)/build/libzimbra-native.$(JNI_EXT):
$(LAUNCHER_DIR)/build/zmmailboxdmgr: $(LAUNCHER_DIR)/build/zmmailboxdmgr:
(cd $(LAUNCHER_DIR); make JAVA_BINARY=$(JAVA_BINARY)) (cd $(LAUNCHER_DIR); make JAVA_BINARY=$(JAVA_BINARY))
$(CORE_DEST_DIR)/jdk-$(JAVA_VERSION): $(CORE_DEST_DIR)/jdk$(JAVA_VERSION):
@echo "*** Creating java" @echo "*** Creating java"
(cd $(CORE_DEST_DIR); tar xzf $(JAVA_SOURCE).tgz;) (cd $(CORE_DEST_DIR); tar xzf $(JAVA_SOURCE).tgz;)
rm -rf $@/jre/lsrc.zip rm -rf $@/jre/lsrc.zip
......
...@@ -12,7 +12,7 @@ DEV_INSTALL_COMPONENTS := \ ...@@ -12,7 +12,7 @@ DEV_INSTALL_COMPONENTS := \
$(DEV_INSTALL_ROOT)/libexec \ $(DEV_INSTALL_ROOT)/libexec \
$(DEV_INSTALL_ROOT)/bin \ $(DEV_INSTALL_ROOT)/bin \
$(DEV_INSTALL_ROOT)/conf \ $(DEV_INSTALL_ROOT)/conf \
$(DEV_INSTALL_ROOT)/$(JAVA_FILE)-$(JAVA_VERSION) \ $(DEV_INSTALL_ROOT)/$(JAVA_FILE)$(JAVA_VERSION) \
$(DEV_INSTALL_ROOT)/$(POSTFIX_DIR) \ $(DEV_INSTALL_ROOT)/$(POSTFIX_DIR) \
$(DEV_INSTALL_ROOT)/$(SASL_DIR) \ $(DEV_INSTALL_ROOT)/$(SASL_DIR) \
$(DEV_INSTALL_ROOT)/$(SNMP_DIR) $(DEV_INSTALL_ROOT)/$(SNMP_DIR)
...@@ -72,7 +72,7 @@ dev-install: $(DEV_INSTALL_COMPONENTS) ...@@ -72,7 +72,7 @@ dev-install: $(DEV_INSTALL_COMPONENTS)
ln -s $(DEV_INSTALL_ROOT)/$(TOMCAT_DIR) $(DEV_INSTALL_ROOT)/tomcat ln -s $(DEV_INSTALL_ROOT)/$(TOMCAT_DIR) $(DEV_INSTALL_ROOT)/tomcat
ln -s $(DEV_INSTALL_ROOT)/$(MYSQL_DIR) $(DEV_INSTALL_ROOT)/mysql ln -s $(DEV_INSTALL_ROOT)/$(MYSQL_DIR) $(DEV_INSTALL_ROOT)/mysql
ln -s $(DEV_INSTALL_ROOT)/$(LDAP_DIR)-$(LDAP_VERSION) $(DEV_INSTALL_ROOT)/openldap ln -s $(DEV_INSTALL_ROOT)/$(LDAP_DIR)-$(LDAP_VERSION) $(DEV_INSTALL_ROOT)/openldap
ln -s $(DEV_INSTALL_ROOT)/$(JAVA_FILE)-$(JAVA_VERSION) \ ln -s $(DEV_INSTALL_ROOT)/$(JAVA_FILE)$(JAVA_VERSION) \
$(DEV_INSTALL_ROOT)/java $(DEV_INSTALL_ROOT)/java
ln -s $(DEV_INSTALL_ROOT)/$(BDB_DIR) $(DEV_INSTALL_ROOT)/bdb ln -s $(DEV_INSTALL_ROOT)/$(BDB_DIR) $(DEV_INSTALL_ROOT)/bdb
ln -s $(DEV_INSTALL_ROOT)/$(POSTFIX_DIR) $(DEV_INSTALL_ROOT)/postfix ln -s $(DEV_INSTALL_ROOT)/$(POSTFIX_DIR) $(DEV_INSTALL_ROOT)/postfix
...@@ -213,8 +213,8 @@ $(DEV_INSTALL_ROOT)/conf: $(SERVICE_DIR)/$(WEBAPP_BUILD_DIR)/service.war ...@@ -213,8 +213,8 @@ $(DEV_INSTALL_ROOT)/conf: $(SERVICE_DIR)/$(WEBAPP_BUILD_DIR)/service.war
mkdir -p $@/spamassassin mkdir -p $@/spamassassin
cp -f $(SERVICE_DIR)/conf/spamassassin/* $@/spamassassin cp -f $(SERVICE_DIR)/conf/spamassassin/* $@/spamassassin
$(DEV_INSTALL_ROOT)/$(JAVA_FILE)-$(JAVA_VERSION): $(DEV_INSTALL_ROOT)/$(JAVA_FILE)$(JAVA_VERSION):
@echo "*** Installing $(JAVA_FILE)-$(JAVA_VERSION)" @echo "*** Installing $(JAVA_FILE)$(JAVA_VERSION)"
(cd $(DEV_INSTALL_ROOT); tar xzf $(JAVA_SOURCE).tgz;) (cd $(DEV_INSTALL_ROOT); tar xzf $(JAVA_SOURCE).tgz;)
dev-stop: dev-stop:
......
...@@ -23,9 +23,9 @@ rm -f /opt/zimbra/java ...@@ -23,9 +23,9 @@ rm -f /opt/zimbra/java
PLAT=`/opt/zimbra/libexec/get_plat_tag.sh` PLAT=`/opt/zimbra/libexec/get_plat_tag.sh`
BIT=`echo $PLAT | awk -F_ '{print $2}'` BIT=`echo $PLAT | awk -F_ '{print $2}'`
if [ "x$BIT" = "x64" ]; then if [ "x$BIT" = "x64" ]; then
ln -s /opt/zimbra/jdk-1.7.0_15 /opt/zimbra/java ln -s /opt/zimbra/jdk1.7.0_15 /opt/zimbra/java
else else
ln -s /opt/zimbra/jdk-1.7.0_15 /opt/zimbra/java ln -s /opt/zimbra/jdk1.7.0_15 /opt/zimbra/java
fi fi
#Symlinks #Symlinks
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment