[CalendarServer-changes] [12603] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 12603
          http://trac.calendarserver.org//changeset/12603
Author:   wsanchez at apple.com
Date:     2014-02-07 10:37:44 -0800 (Fri, 07 Feb 2014)
Log Message:
-----------
_DEVELOP -> _DEVELOP_PROJECT_

Modified Paths:
--------------
    CalendarServer/trunk/bin/_build.sh
    CalendarServer/trunk/bin/develop
    CalendarServer/trunk/bin/pyflakes
    CalendarServer/trunk/bin/python
    CalendarServer/trunk/bin/sim
    CalendarServer/trunk/bin/test
    CalendarServer/trunk/bin/testserver
    CalendarServer/trunk/bin/trial
    CalendarServer/trunk/bin/twistd
    CalendarServer/trunk/setup.py

Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh	2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/_build.sh	2014-02-07 18:37:44 UTC (rev 12603)
@@ -97,6 +97,8 @@
 
   python="${py_bindir}/python";
 
+  project="$(setup_print name)";
+
   if [ -z "${TWEXT_PKG_CACHE-}" ]; then
     dep_packages="${dev_home}/pkg";
   else
@@ -104,6 +106,7 @@
   fi;
 
   export PYTHONPATH="${wd}:${PYTHONPATH:-}";
+  export _DEVELOP_PROJECT_="${project}";
 
   # These variables are defaults for things which might be configured by
   # environment; only set them if they're un-set.

Modified: CalendarServer/trunk/bin/develop
===================================================================
--- CalendarServer/trunk/bin/develop	2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/develop	2014-02-07 18:37:44 UTC (rev 12603)
@@ -23,8 +23,6 @@
   wd="$(cd "$(dirname "$0")/.." && pwd)";
 fi;
 
-export _DEVELOP="true";
-
 . "${wd}/bin/_build.sh";
 
 develop;

Modified: CalendarServer/trunk/bin/pyflakes
===================================================================
--- CalendarServer/trunk/bin/pyflakes	2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/pyflakes	2014-02-07 18:37:44 UTC (rev 12603)
@@ -21,8 +21,6 @@
 
 wd="$(cd "$(dirname "$0")/.." && pwd -L)";
 
-export _DEVELOP="true";
-
 . "${wd}/bin/_build.sh";
 
 init_build > /dev/null;

Modified: CalendarServer/trunk/bin/python
===================================================================
--- CalendarServer/trunk/bin/python	2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/python	2014-02-07 18:37:44 UTC (rev 12603)
@@ -21,10 +21,6 @@
 
 wd="$(cd "$(dirname "$0")/.." && pwd)";
 
-export _DEVELOP="true";
-
-export PYTHONPATH="${wd}:${PYTHONPATH:-}";
-
 . "${wd}/bin/_build.sh";
 
 init_build > /dev/null;

Modified: CalendarServer/trunk/bin/sim
===================================================================
--- CalendarServer/trunk/bin/sim	2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/sim	2014-02-07 18:37:44 UTC (rev 12603)
@@ -21,8 +21,6 @@
 
 wd="$(cd "$(dirname "$0")/.." && pwd -L)";
 
-export _DEVELOP="true";
-
 . "${wd}/bin/_build.sh";
 
 init_build > /dev/null;

Modified: CalendarServer/trunk/bin/test
===================================================================
--- CalendarServer/trunk/bin/test	2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/test	2014-02-07 18:37:44 UTC (rev 12603)
@@ -25,8 +25,6 @@
 
 wd="$(cd "$(dirname "$0")/.." && pwd -L)";
 
-export _DEVELOP="true";
-
 . "${wd}/bin/_build.sh";
 
 init_build > /dev/null;

Modified: CalendarServer/trunk/bin/testserver
===================================================================
--- CalendarServer/trunk/bin/testserver	2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/testserver	2014-02-07 18:37:44 UTC (rev 12603)
@@ -21,8 +21,6 @@
 
 wd="$(cd "$(dirname "$0")/.." && pwd -L)";
 
-export _DEVELOP="true";
-
 . "${wd}/bin/_build.sh";
 
 init_build > /dev/null;

Modified: CalendarServer/trunk/bin/trial
===================================================================
--- CalendarServer/trunk/bin/trial	2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/trial	2014-02-07 18:37:44 UTC (rev 12603)
@@ -21,8 +21,6 @@
 
 wd="$(cd "$(dirname "$0")/.." && pwd)";
 
-export _DEVELOP="true";
-
 . "${wd}/bin/_build.sh";
 
 init_build > /dev/null;

Modified: CalendarServer/trunk/bin/twistd
===================================================================
--- CalendarServer/trunk/bin/twistd	2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/twistd	2014-02-07 18:37:44 UTC (rev 12603)
@@ -21,8 +21,6 @@
 
 wd="$(cd "$(dirname "$0")/.." && pwd)";
 
-export _DEVELOP="true";
-
 . "${wd}/bin/_build.sh";
 
 init_build > /dev/null;

Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py	2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/setup.py	2014-02-07 18:37:44 UTC (rev 12603)
@@ -101,6 +101,8 @@
 # Options
 #
 
+name = "CalendarServer"
+
 description = "Calendar and Contacts Server"
 
 long_description = file(joinpath(dirname(__file__), "README.rst")).read()
@@ -148,7 +150,7 @@
 # Requirements for development and testing
 develop_requirements = read_requirements("py_develop.txt")
 
-if environment.get("_DEVELOP", "false") == "true":
+if environment.get("_DEVELOP_PROJECT_", None) == name:
     install_requirements.extend(develop_requirements)
     install_requirements.extend(chain(*extras_requirements.values()))
 
@@ -191,7 +193,7 @@
         version_file.close()
 
     dist = setup(
-        name="CalendarServer",
+        name=name,
         version=version_string,
         description=description,
         long_description=long_description,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/2d097724/attachment.html>