Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zimbra
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
zimbra
Commits
5ccdd4f9
Commit
5ccdd4f9
authored
Mar 27, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jdk-{version} => jdk{version} (name of folder inside jdk archive)
parent
b611d846
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
ZimbraBuild/defs/components.def
ZimbraBuild/defs/components.def
+1
-1
ZimbraBuild/defs/coretargets.def
ZimbraBuild/defs/coretargets.def
+3
-3
ZimbraBuild/defs/devtargets.def
ZimbraBuild/defs/devtargets.def
+4
-4
ZimbraBuild/rpmconf/Spec/Scripts/zimbra-core.post
ZimbraBuild/rpmconf/Spec/Scripts/zimbra-core.post
+2
-2
No files found.
ZimbraBuild/defs/components.def
View file @
5ccdd4f9
...
...
@@ -24,7 +24,7 @@ CORE_COMPONENTS := \
$(CORE_DEST_DIR)/bin \
$(CORE_DEST_DIR)/contrib \
$(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)/docs \
$(CORE_DEST_DIR)/$(BDB_DIR) \
...
...
ZimbraBuild/defs/coretargets.def
View file @
5ccdd4f9
...
...
@@ -10,7 +10,7 @@ core: $(PACKAGE_DIR) core_stage core_pkg_spec_$(PACKAGE_EXT)
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
rm -rf $(CORE_DEST_DIR)/$(JAVA_FILE)
-
$(JAVA_VERSION)
rm -rf $(CORE_DEST_DIR)/$(JAVA_FILE)$(JAVA_VERSION)
$(BUILD_ROOT)/zimbra-core.Description.plist:
cat $(PACKAGE_CONF_DIR)/Spec/zimbra-core.Description.plist | \
...
...
@@ -95,7 +95,7 @@ $(BUILD_ROOT)/zimbra-core.spec:
$(BUILD_ROOT)/zimbra-core.spec
echo "%attr(-, zimbra, zimbra) /opt/zimbra/db" >> \
$(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
echo "%attr(-, root, root) /opt/zimbra/lib" >> \
$(BUILD_ROOT)/zimbra-core.spec
...
...
@@ -220,7 +220,7 @@ $(NATIVE_DIR)/build/libzimbra-native.$(JNI_EXT):
$(LAUNCHER_DIR)/build/zmmailboxdmgr:
(cd $(LAUNCHER_DIR); make JAVA_BINARY=$(JAVA_BINARY))
$(CORE_DEST_DIR)/jdk
-
$(JAVA_VERSION):
$(CORE_DEST_DIR)/jdk$(JAVA_VERSION):
@echo "*** Creating java"
(cd $(CORE_DEST_DIR); tar xzf $(JAVA_SOURCE).tgz;)
rm -rf $@/jre/lsrc.zip
...
...
ZimbraBuild/defs/devtargets.def
View file @
5ccdd4f9
...
...
@@ -12,7 +12,7 @@ DEV_INSTALL_COMPONENTS := \
$(DEV_INSTALL_ROOT)/libexec \
$(DEV_INSTALL_ROOT)/bin \
$(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)/$(SASL_DIR) \
$(DEV_INSTALL_ROOT)/$(SNMP_DIR)
...
...
@@ -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)/$(MYSQL_DIR) $(DEV_INSTALL_ROOT)/mysql
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
ln -s $(DEV_INSTALL_ROOT)/$(BDB_DIR) $(DEV_INSTALL_ROOT)/bdb
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
mkdir -p $@/spamassassin
cp -f $(SERVICE_DIR)/conf/spamassassin/* $@/spamassassin
$(DEV_INSTALL_ROOT)/$(JAVA_FILE)
-
$(JAVA_VERSION):
@echo "*** Installing $(JAVA_FILE)
-
$(JAVA_VERSION)"
$(DEV_INSTALL_ROOT)/$(JAVA_FILE)$(JAVA_VERSION):
@echo "*** Installing $(JAVA_FILE)$(JAVA_VERSION)"
(cd $(DEV_INSTALL_ROOT); tar xzf $(JAVA_SOURCE).tgz;)
dev-stop:
...
...
ZimbraBuild/rpmconf/Spec/Scripts/zimbra-core.post
View file @
5ccdd4f9
...
...
@@ -23,9 +23,9 @@ rm -f /opt/zimbra/java
PLAT
=
`
/opt/zimbra/libexec/get_plat_tag.sh
`
BIT
=
`
echo
$PLAT
|
awk
-F_
'{print $2}'
`
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
ln
-s
/opt/zimbra/jdk
-
1.7.0_15 /opt/zimbra/java
ln
-s
/opt/zimbra/jdk1.7.0_15 /opt/zimbra/java
fi
#Symlinks
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment