[CalendarServer-changes] [13407] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 2 11:42:58 PDT 2014
Revision: 13407
http://trac.calendarserver.org//changeset/13407
Author: wsanchez at apple.com
Date: 2014-05-02 11:42:58 -0700 (Fri, 02 May 2014)
Log Message:
-----------
Use entry points to make scripts
Modified Paths:
--------------
CalendarServer/trunk/bin/develop
CalendarServer/trunk/setup.py
Removed Paths:
-------------
CalendarServer/trunk/bin/calendarserver_check_database_schema
CalendarServer/trunk/bin/calendarserver_command_gateway
CalendarServer/trunk/bin/calendarserver_config
CalendarServer/trunk/bin/calendarserver_dashboard
CalendarServer/trunk/bin/calendarserver_dbinspect
CalendarServer/trunk/bin/calendarserver_dkimtool
CalendarServer/trunk/bin/calendarserver_export
CalendarServer/trunk/bin/calendarserver_icalendar_validate
CalendarServer/trunk/bin/calendarserver_manage_principals
CalendarServer/trunk/bin/calendarserver_manage_push
CalendarServer/trunk/bin/calendarserver_manage_timezones
CalendarServer/trunk/bin/calendarserver_migrate_resources
CalendarServer/trunk/bin/calendarserver_monitor_amp_notifications
CalendarServer/trunk/bin/calendarserver_monitor_notifications
CalendarServer/trunk/bin/calendarserver_monitor_work
CalendarServer/trunk/bin/calendarserver_purge_attachments
CalendarServer/trunk/bin/calendarserver_purge_events
CalendarServer/trunk/bin/calendarserver_purge_principals
CalendarServer/trunk/bin/calendarserver_shell
CalendarServer/trunk/bin/calendarserver_upgrade
CalendarServer/trunk/bin/calendarserver_verify_data
CalendarServer/trunk/bin/py/
Property Changed:
----------------
CalendarServer/trunk/bin/
Property changes on: CalendarServer/trunk/bin
___________________________________________________________________
Modified: svn:ignore
- server.log.*
+ calendarserver_*
Deleted: CalendarServer/trunk/bin/calendarserver_check_database_schema
===================================================================
--- CalendarServer/trunk/bin/calendarserver_check_database_schema 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_check_database_schema 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_command_gateway
===================================================================
--- CalendarServer/trunk/bin/calendarserver_command_gateway 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_command_gateway 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_config
===================================================================
--- CalendarServer/trunk/bin/calendarserver_config 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_config 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_dashboard
===================================================================
--- CalendarServer/trunk/bin/calendarserver_dashboard 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_dashboard 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_dbinspect
===================================================================
--- CalendarServer/trunk/bin/calendarserver_dbinspect 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_dbinspect 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_dkimtool
===================================================================
--- CalendarServer/trunk/bin/calendarserver_dkimtool 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_dkimtool 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_export
===================================================================
--- CalendarServer/trunk/bin/calendarserver_export 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_export 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_icalendar_validate
===================================================================
--- CalendarServer/trunk/bin/calendarserver_icalendar_validate 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_icalendar_validate 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_manage_principals
===================================================================
--- CalendarServer/trunk/bin/calendarserver_manage_principals 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_manage_principals 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_manage_push
===================================================================
--- CalendarServer/trunk/bin/calendarserver_manage_push 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_manage_push 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_manage_timezones
===================================================================
--- CalendarServer/trunk/bin/calendarserver_manage_timezones 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_manage_timezones 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_migrate_resources
===================================================================
--- CalendarServer/trunk/bin/calendarserver_migrate_resources 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_migrate_resources 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_monitor_amp_notifications
===================================================================
--- CalendarServer/trunk/bin/calendarserver_monitor_amp_notifications 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_monitor_amp_notifications 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_monitor_notifications
===================================================================
--- CalendarServer/trunk/bin/calendarserver_monitor_notifications 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_monitor_notifications 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_monitor_work
===================================================================
--- CalendarServer/trunk/bin/calendarserver_monitor_work 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_monitor_work 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_purge_attachments
===================================================================
--- CalendarServer/trunk/bin/calendarserver_purge_attachments 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_purge_attachments 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_purge_events
===================================================================
--- CalendarServer/trunk/bin/calendarserver_purge_events 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_purge_events 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_purge_principals
===================================================================
--- CalendarServer/trunk/bin/calendarserver_purge_principals 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_purge_principals 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_shell
===================================================================
--- CalendarServer/trunk/bin/calendarserver_shell 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_shell 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_upgrade
===================================================================
--- CalendarServer/trunk/bin/calendarserver_upgrade 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_upgrade 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Deleted: CalendarServer/trunk/bin/calendarserver_verify_data
===================================================================
--- CalendarServer/trunk/bin/calendarserver_verify_data 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/calendarserver_verify_data 2014-05-02 18:42:58 UTC (rev 13407)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" -f "${wd}/conf/caldavd-dev.plist" "$@";
Modified: CalendarServer/trunk/bin/develop
===================================================================
--- CalendarServer/trunk/bin/develop 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/bin/develop 2014-05-02 18:42:58 UTC (rev 13407)
@@ -28,10 +28,24 @@
develop;
+cd ${wd};
+
+
#
+# Link to scripts for convenience
+#
+find .develop/virtualenv/bin -type f -name "calendarserver_*" | {
+ while read source; do
+ target="${wd}/bin/$(basename ${source})";
+ ln -s "../${source}" "${target}";
+ done;
+}
+
+
+#
# Create a subprojects directory with -e checkouts for convenience.
#
-cd ${wd} && find .develop/virtualenv/src -maxdepth 1 -mindepth 1 -type d | {
+find .develop/virtualenv/src -depth 1 -type d | {
while read source; do
deps="${wd}/subprojects";
mkdir -p "${deps}";
Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py 2014-05-02 17:24:14 UTC (rev 13406)
+++ CalendarServer/trunk/setup.py 2014-05-02 18:42:58 UTC (rev 13407)
@@ -136,33 +136,81 @@
#
entry_points = {
- "console_scripts": [
- "calendarserver_check_database_schema = calendarserver.tools.checkdatabaseschema:main",
- "calendarserver_command_gateway = calendarserver.tools.gateway:main",
- "calendarserver_config = calendarserver.tools.config:main",
- "calendarserver_dashboard = calendarserver.tools.dashboard:main",
- "calendarserver_dbinspect = calendarserver.tools.dbinspect:main",
- "calendarserver_dkimtool = calendarserver.tools.dkimtool:main",
- "calendarserver_export = calendarserver.tools.export:main",
- "calendarserver_icalendar_validate = calendarserver.tools.validcalendardata:main",
- "calendarserver_manage_principals = calendarserver.tools.principals:main",
- "calendarserver_manage_push = calendarserver.tools.push:main",
- "calendarserver_manage_timezones = calendarserver.tools.managetimezones:main",
- "calendarserver_migrate_resources = calendarserver.tools.resources:main",
- "calendarserver_monitor_amp_notifications = calendarserver.tools.ampnotifications:main",
- "calendarserver_monitor_notifications = calendarserver.tools.notifications:main",
- "calendarserver_monitor_work = calendarserver.tools.workitems:main",
- "calendarserver_purge_attachments = calendarserver.tools.purge:PurgeAttachmentsService.main",
- "calendarserver_purge_events = calendarserver.tools.purge:PurgeOldEventsService.main",
- "calendarserver_purge_principals = calendarserver.tools.purge:PurgePrincipalService.main",
- "calendarserver_shell = calendarserver.tools.shell.terminal:main",
- "calendarserver_upgrade = calendarserver.tools.upgrade:main",
- "calendarserver_verify_data = calendarserver.tools.calverify:main",
- ],
+ "console_scripts": [],
}
+script_entry_points = {
+ "check_database_schema":
+ ("calendarserver.tools.checkdatabaseschema", "main"),
+ "command_gateway":
+ ("calendarserver.tools.gateway", "main"),
+ "config":
+ ("calendarserver.tools.config", "main"),
+
+ "dashboard":
+ ("calendarserver.tools.dashboard", "main"),
+
+ "dbinspect":
+ ("calendarserver.tools.dbinspect", "main"),
+
+ "dkimtool":
+ ("calendarserver.tools.dkimtool", "main"),
+
+ "export":
+ ("calendarserver.tools.export", "main"),
+
+ "icalendar_validate":
+ ("calendarserver.tools.validcalendardata", "main"),
+
+ "manage_principals":
+ ("calendarserver.tools.principals", "main"),
+
+ "manage_push":
+ ("calendarserver.tools.push", "main"),
+
+ "manage_timezones":
+ ("calendarserver.tools.managetimezones", "main"),
+
+ "migrate_resources":
+ ("calendarserver.tools.resources", "main"),
+
+ "monitor_amp_notifications":
+ ("calendarserver.tools.ampnotifications", "main"),
+
+ "monitor_notifications":
+ ("calendarserver.tools.notifications", "main"),
+
+ "monitor_work":
+ ("calendarserver.tools.workitems", "main"),
+
+ "purge_attachments":
+ ("calendarserver.tools.purge", "PurgeAttachmentsService.main"),
+
+ "purge_events":
+ ("calendarserver.tools.purge", "PurgeOldEventsService.main"),
+
+ "purge_principals":
+ ("calendarserver.tools.purge", "PurgePrincipalService.main"),
+
+ "shell":
+ ("calendarserver.tools.shell.terminal", "main"),
+
+ "upgrade":
+ ("calendarserver.tools.upgrade", "main"),
+
+ "verify_data":
+ ("calendarserver.tools.calverify", "main"),
+}
+
+for name, (m, f) in script_entry_points.iteritems():
+ entry_points["console_scripts"].append(
+ "calendarserver_{} = {}:{}".format(name, m, f)
+ )
+
+
+
#
# Dependencies
#
@@ -273,29 +321,9 @@
"sql_schema/*/*/*.sql",
],
},
+ entry_points=entry_points,
scripts=[
"bin/caldavd",
- # "bin/py/calendarserver_check_database_schema",
- "bin/py/calendarserver_command_gateway",
- "bin/py/calendarserver_config",
- # "bin/py/calendarserver_dashboard",
- # "bin/py/calendarserver_dbinspect",
- # "bin/py/calendarserver_dkimtool",
- "bin/py/calendarserver_export",
- # "bin/py/calendarserver_icalendar_validate",
- "bin/py/calendarserver_manage_principals",
- # "bin/py/calendarserver_manage_push",
- # "bin/py/calendarserver_manage_timezones",
- "bin/py/calendarserver_migrate_resources", # Obsolete this in v7.
- # "bin/py/calendarserver_monitor_amp_notifications",
- # "bin/py/calendarserver_monitor_notifications",
- # "bin/py/calendarserver_monitor_work",
- "bin/py/calendarserver_purge_attachments",
- "bin/py/calendarserver_purge_events",
- "bin/py/calendarserver_purge_principals",
- "bin/py/calendarserver_shell",
- "bin/py/calendarserver_upgrade",
- # "bin/py/calendarserver_verify_data",
],
data_files=[
("caldavd", ["conf/caldavd.plist"]),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140502/4dca7439/attachment-0001.html>
More information about the calendarserver-changes
mailing list