[CalendarServer-changes] [13422] CalendarServer/trunk/bin/_build.sh
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 2 19:32:30 PDT 2014
Revision: 13422
http://trac.calendarserver.org//changeset/13422
Author: wsanchez at apple.com
Date: 2014-05-02 19:32:30 -0700 (Fri, 02 May 2014)
Log Message:
-----------
Don't need svn_get
Modified Paths:
--------------
CalendarServer/trunk/bin/_build.sh
Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh 2014-05-03 02:32:17 UTC (rev 13421)
+++ CalendarServer/trunk/bin/_build.sh 2014-05-03 02:32:30 UTC (rev 13422)
@@ -307,79 +307,6 @@
}
-# If do_get is turned on, check a name out from SVN.
-svn_get () {
- if ! "${do_get}"; then
- return 0;
- fi;
-
- local name="$1"; shift;
- local path="$1"; shift;
- local uri="$1"; shift;
- local revision="$1"; shift;
-
- if [ -d "${path}" ]; then
- local wc_uri="$(svn info --xml "${path}" 2> /dev/null | sed -n 's|^.*<url>\(.*\)</url>.*$|\1|p')";
-
- if "${force_setup}"; then
- # Verify that we have a working copy checked out from the correct URI
- if [ "${wc_uri}" != "${uri}" ]; then
- echo "Current working copy (${path}) is from the wrong URI: ${wc_uri} != ${uri}";
- rm -rf "${path}";
- svn_get "${name}" "${path}" "${uri}" "${revision}";
- return $?;
- fi;
-
- echo "Reverting ${name}...";
- svn revert -R "${path}";
-
- echo "Updating ${name}...";
- svn update -r "${revision}" "${path}";
- else
- # Verify that we have a working copy checked out from the correct URI
- if [ "${wc_uri}" != "${uri}" ]; then
- echo "Current working copy (${path}) is from the wrong URI: ${wc_uri} != ${uri}";
- echo "Performing repository switch for ${name}...";
- svn switch -r "${revision}" "${uri}" "${path}";
- else
- local svnversion="$(svnversion "${path}")";
- if [ "${svnversion%%[M:]*}" != "${revision}" ]; then
- echo "Updating ${name}...";
- svn update -r "${revision}" "${path}";
- fi;
- fi;
- fi;
- else
- checkout () {
- echo "Checking out ${name}...";
- svn checkout -r "${revision}" "${uri}@${revision}" "${path}";
- }
-
- if [ "${revision}" != "HEAD" ] && \
- [ -n "${dep_packages}" ] && \
- [ -n "${hash}" ] \
- ; then
- local cacheid="${name}-$(echo "${uri}" | hash)";
- local cache_file="${dep_packages}/${cacheid}@r${revision}.tgz";
-
- mkdir -p "${dep_packages}";
-
- if [ -f "${cache_file}" ]; then
- echo "Unpacking ${name} from cache...";
- mkdir -p "${path}";
- tar -C "${path}" -xvzf "${cache_file}";
- else
- checkout;
- echo "Caching ${name}...";
- tar -C "${path}" -cvzf "${cache_file}" .;
- fi;
- else
- checkout;
- fi;
- fi;
-}
-
-
# Run 'make' with the given command line, prepending a -j option appropriate to
# the number of CPUs on the current machine, if that can be determined.
jmake () {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140502/eacfe60c/attachment.html>
More information about the calendarserver-changes
mailing list