[CalendarServer-changes] [15728] CalendarServer/branches/users/cdaboo/better-next-job
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jun 30 10:00:17 PDT 2016
Revision: 15728
http://trac.calendarserver.org//changeset/15728
Author: cdaboo at apple.com
Date: 2016-06-30 10:00:17 -0700 (Thu, 30 Jun 2016)
Log Message:
-----------
Merge from trunk.
Modified Paths:
--------------
CalendarServer/branches/users/cdaboo/better-next-job/bin/_build.sh
CalendarServer/branches/users/cdaboo/better-next-job/bin/caldavd
CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/ReadMe.md
CalendarServer/branches/users/cdaboo/better-next-job/setup.py
CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_tables.py
Removed Paths:
-------------
CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/oracle-on-mac.py
Property Changed:
----------------
CalendarServer/branches/users/cdaboo/better-next-job/
Property changes on: CalendarServer/branches/users/cdaboo/better-next-job
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/trunk:11193-11198
/CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/generic-sqlstore:6167-6191
/CalendarServer/branches/new-store:5594-5934
/CalendarServer/branches/new-store-no-caldavfile:5911-5935
/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
/CalendarServer/branches/users/cdaboo/json:11622-11912
/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
/CalendarServer/branches/users/cdaboo/newlog:15301
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
/CalendarServer/branches/users/cdaboo/pod2pod-migration:14338-14520
/CalendarServer/branches/users/cdaboo/pods:7297-7377
/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
/CalendarServer/branches/users/cdaboo/pycard:7227-7237
/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
/CalendarServer/branches/users/cdaboo/timezones:7443-7699
/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
/CalendarServer/branches/users/cdaboo/update-packages:15273-15284
/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
/CalendarServer/branches/users/glyph/conn-limit:6574-6577
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/glyph/dalify:6932-7023
/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
/CalendarServer/branches/users/glyph/deploybuild:7563-7572
/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
/CalendarServer/branches/users/glyph/disable-quota:7718-7727
/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
/CalendarServer/branches/users/glyph/hang-fix:11465-11491
/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
/CalendarServer/branches/users/glyph/linux-tests:6893-6900
/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
/CalendarServer/branches/users/glyph/new-export:7444-7485
/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
/CalendarServer/branches/users/glyph/oracle:7106-7155
/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
/CalendarServer/branches/users/glyph/other-html:8062-8091
/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
/CalendarServer/branches/users/glyph/q:9560-9688
/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
/CalendarServer/branches/users/glyph/quota:7604-7637
/CalendarServer/branches/users/glyph/sendfdport:5388-5424
/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
/CalendarServer/branches/users/glyph/sharedpool:6490-6550
/CalendarServer/branches/users/glyph/sharing-api:9192-9205
/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
/CalendarServer/branches/users/glyph/sql-store:5929-6073
/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
/CalendarServer/branches/users/glyph/subtransactions:7248-7258
/CalendarServer/branches/users/glyph/table-alias:8651-8664
/CalendarServer/branches/users/glyph/uidexport:7673-7676
/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
/CalendarServer/branches/users/sagen/applepush:8126-8184
/CalendarServer/branches/users/sagen/inboxitems:7380-7381
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/move2who:12819-12860
/CalendarServer/branches/users/sagen/move2who-2:12861-12898
/CalendarServer/branches/users/sagen/move2who-3:12899-12913
/CalendarServer/branches/users/sagen/move2who-4:12914-13157
/CalendarServer/branches/users/sagen/move2who-5:13158-13163
/CalendarServer/branches/users/sagen/newcua:13309-13327
/CalendarServer/branches/users/sagen/newcua-1:13328-13330
/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
/CalendarServer/branches/users/sagen/recordtypes:13648-13656
/CalendarServer/branches/users/sagen/recordtypes-2:13657
/CalendarServer/branches/users/sagen/request-socket:14748-14767
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
/CalendarServer/branches/users/sagen/trashcan:14185-14269
/CalendarServer/branches/users/sagen/trashcan-2:14270-14324
/CalendarServer/branches/users/sagen/trashcan-3:14325-14450
/CalendarServer/branches/users/sagen/trashcan-4:14451-14471
/CalendarServer/branches/users/sagen/trashcan-5:14471-14555
/CalendarServer/branches/users/wsanchez/psycopg2cffi:14427-14439
/CalendarServer/branches/users/wsanchez/transations:5515-5593
+ /CalDAVTester/trunk:11193-11198
/CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/generic-sqlstore:6167-6191
/CalendarServer/branches/new-store:5594-5934
/CalendarServer/branches/new-store-no-caldavfile:5911-5935
/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
/CalendarServer/branches/users/cdaboo/json:11622-11912
/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
/CalendarServer/branches/users/cdaboo/newlog:15301
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
/CalendarServer/branches/users/cdaboo/pod2pod-migration:14338-14520
/CalendarServer/branches/users/cdaboo/pods:7297-7377
/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
/CalendarServer/branches/users/cdaboo/pycard:7227-7237
/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
/CalendarServer/branches/users/cdaboo/timezones:7443-7699
/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
/CalendarServer/branches/users/cdaboo/update-packages:15273-15284
/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
/CalendarServer/branches/users/glyph/conn-limit:6574-6577
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/glyph/dalify:6932-7023
/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
/CalendarServer/branches/users/glyph/deploybuild:7563-7572
/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
/CalendarServer/branches/users/glyph/disable-quota:7718-7727
/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
/CalendarServer/branches/users/glyph/hang-fix:11465-11491
/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
/CalendarServer/branches/users/glyph/linux-tests:6893-6900
/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
/CalendarServer/branches/users/glyph/new-export:7444-7485
/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
/CalendarServer/branches/users/glyph/oracle:7106-7155
/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
/CalendarServer/branches/users/glyph/other-html:8062-8091
/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
/CalendarServer/branches/users/glyph/q:9560-9688
/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
/CalendarServer/branches/users/glyph/quota:7604-7637
/CalendarServer/branches/users/glyph/sendfdport:5388-5424
/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
/CalendarServer/branches/users/glyph/sharedpool:6490-6550
/CalendarServer/branches/users/glyph/sharing-api:9192-9205
/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
/CalendarServer/branches/users/glyph/sql-store:5929-6073
/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
/CalendarServer/branches/users/glyph/subtransactions:7248-7258
/CalendarServer/branches/users/glyph/table-alias:8651-8664
/CalendarServer/branches/users/glyph/uidexport:7673-7676
/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
/CalendarServer/branches/users/sagen/applepush:8126-8184
/CalendarServer/branches/users/sagen/inboxitems:7380-7381
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/move2who:12819-12860
/CalendarServer/branches/users/sagen/move2who-2:12861-12898
/CalendarServer/branches/users/sagen/move2who-3:12899-12913
/CalendarServer/branches/users/sagen/move2who-4:12914-13157
/CalendarServer/branches/users/sagen/move2who-5:13158-13163
/CalendarServer/branches/users/sagen/newcua:13309-13327
/CalendarServer/branches/users/sagen/newcua-1:13328-13330
/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
/CalendarServer/branches/users/sagen/recordtypes:13648-13656
/CalendarServer/branches/users/sagen/recordtypes-2:13657
/CalendarServer/branches/users/sagen/request-socket:14748-14767
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
/CalendarServer/branches/users/sagen/trashcan:14185-14269
/CalendarServer/branches/users/sagen/trashcan-2:14270-14324
/CalendarServer/branches/users/sagen/trashcan-3:14325-14450
/CalendarServer/branches/users/sagen/trashcan-4:14451-14471
/CalendarServer/branches/users/sagen/trashcan-5:14471-14555
/CalendarServer/branches/users/wsanchez/psycopg2cffi:14427-14439
/CalendarServer/branches/users/wsanchez/transations:5515-5593
/CalendarServer/trunk:15717-15725
Modified: CalendarServer/branches/users/cdaboo/better-next-job/bin/_build.sh
===================================================================
--- CalendarServer/branches/users/cdaboo/better-next-job/bin/_build.sh 2016-06-30 16:51:50 UTC (rev 15727)
+++ CalendarServer/branches/users/cdaboo/better-next-job/bin/_build.sh 2016-06-30 17:00:17 UTC (rev 15728)
@@ -720,6 +720,19 @@
}
+macos_oracle () {
+ if [ "${ORACLE_HOME-}" ]; then
+ case "$(uname -s)" in
+ Darwin)
+ echo "macOS Oracle init."
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:${ORACLE_HOME}";
+ export DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH:-}:${ORACLE_HOME}";
+ ;;
+ esac;
+ fi;
+}
+
+
bootstrap_virtualenv () {
mkdir -p "${py_ve_tools}";
mkdir -p "${py_ve_tools}/lib";
@@ -801,6 +814,7 @@
init_build;
c_dependencies;
py_dependencies;
+ macos_oracle;
}
Modified: CalendarServer/branches/users/cdaboo/better-next-job/bin/caldavd
===================================================================
--- CalendarServer/branches/users/cdaboo/better-next-job/bin/caldavd 2016-06-30 16:51:50 UTC (rev 15727)
+++ CalendarServer/branches/users/cdaboo/better-next-job/bin/caldavd 2016-06-30 17:00:17 UTC (rev 15728)
@@ -131,4 +131,14 @@
export PYTHONPATH
+if [ "${ORACLE_HOME-}" ]; then
+ case "$(uname -s)" in
+ Darwin)
+ echo "macOS Oracle init."
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:${ORACLE_HOME}";
+ export DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH:-}:${ORACLE_HOME}";
+ ;;
+ esac;
+fi;
+
exec "${python}" "${twistdpath}" ${twistd_profile} ${twistd_reactor} ${daemonize} ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type} ${errorlogenabled} ${profile} ${child_reactor} ${extra};
Modified: CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/ReadMe.md
===================================================================
--- CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/ReadMe.md 2016-06-30 16:51:50 UTC (rev 15727)
+++ CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/ReadMe.md 2016-06-30 17:00:17 UTC (rev 15728)
@@ -2,9 +2,38 @@
## Setup
+### Oracle instantclient
+
+Download instantclient locally from "http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html"
+
+* instantclient-basic-macos.x64-11.2.0.4.0.zip
+* instantclient-sdk-macos.x64-11.2.0.4.0.zip
+
+Then run:
+
+ mkdir .oracle
+ cd .oracle
+ <<copy instantclient zips here>>
+ unzip instantclient-basic-macos.x64-11.2.0.4.0.zip
+ unzip instantclient-sdk-macos.x64-11.2.0.4.0.zip
+ ln -sf . lib
+ ln -sf libclntsh.dylib.11.1 libclntsh.dylib
+ cd ~
+ cat >> .bash_profile
+ function oracle_11 () {
+ export ORACLE_HOME="$HOME/.oracle/instantclient_11_2";
+
+ # make sure we can find the client libraries
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ORACLE_HOME";
+ export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$ORACLE_HOME";
+ }
+ ^D
+
+### Local Oracle Database
+If you want to run your own Oracle database rather than use an existing one:
+
* Get VirtualBox
* Install OTN\_Developer\_Day\_VM\_12c.otn
-* Install instantclient locally
## Run
@@ -16,13 +45,13 @@
* In sqlplus: `@rebuild;`
### CS
-* Configure the DB:
+* Run the `oracle_11` alias to make sure paths are setup.
+* Rebuild the server with `bin/develop` to ensure the `cx_Oracle` module is built
+* Configure the DB in caldav-dev.plist:
endpoint: tcp:192.168.56.101:1521
database: orcl
user: hr
password: oracle
-* Paths: ensure that `~/.oracle/instantclient_xxx` is in `LD_LIBRARY_PATH`, `DYLD_LIBRARY_PATH`, and `ORACLE_HOME`
-
* Run server
Deleted: CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/oracle-on-mac.py
===================================================================
--- CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/oracle-on-mac.py 2016-06-30 16:51:50 UTC (rev 15727)
+++ CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/oracle-on-mac.py 2016-06-30 17:00:17 UTC (rev 15728)
@@ -1,84 +0,0 @@
-
-import webbrowser
-
-from pipes import quote as shellquote
-from textwrap import wrap, dedent
-from os.path import exists, expanduser, join as j
-from os import mkdir, symlink
-from errno import EEXIST, EISDIR
-from zipfile import ZipFile
-
-dlpage = "http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html"
-
-downloads = [
- "instantclient-basic-macos.x64-11.2.0.4.0.zip",
- "instantclient-sdk-macos.x64-11.2.0.4.0.zip",
- "instantclient-sqlplus-macos.x64-11.2.0.4.0.zip",
-]
-
-ordir = expanduser("~/.oracle")
-
-
-
-def mkdirp(d):
- try:
- mkdir(d)
- except OSError, ose:
- if ose.errno not in (EEXIST, EISDIR):
- pass
-mkdirp(ordir)
-
-
-
-def downloaded():
- for download in downloads:
- dl = j(expanduser("~/Downloads/OracleDB"), download)
- if exists(dl):
- ZipFile(dl).extractall(ordir)
- continue
- break
- else:
- return True
- return False
-
-import fcntl
-import tty
-import struct
-th, tw, ign, ign = struct.unpack("4H", fcntl.ioctl(0, tty.TIOCGWINSZ, 'x' * 8))
-
-while not downloaded():
- txt = "\n".join(wrap(" ".join("""
- Please sanctify the files, which I cannot automatically download, with your
- consent to abide by their respective license agreements via your web browser,
- then hit 'enter' to continue. You need:
- """.split()), tw)) + "\n\n" + "\n".join(downloads)
- webbrowser.open(dlpage)
- raw_input(txt)
-
-instantclient = j(ordir, "instantclient_11_2")
-
-# # Oracle is for Professional Software Engineers only. Don't look for any namby-
-# # pamby "user interface" or "working installation process" here!
-for pdest in ["libclntsh.dylib.11.2", "libclntsh.dylib.11.1"]:
- pdestfull = j(instantclient, pdest)
- psrcfull = j(instantclient, "libclntsh.dylib")
- if exists(pdestfull) and not exists(psrcfull):
- symlink(pdestfull, psrcfull)
- break
-
-ldestfull = j(instantclient, "lib")
-if not exists(ldestfull):
- symlink(".", ldestfull)
-
-with open(expanduser("~/.bash_profile"), "a") as f:
- f.write(dedent(
- """
- function oracle_11 () {
- export ORACLE_HOME="$HOME/.oracle/instantclient_11_2";
-
- # make sure we can find the client libraries
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ORACLE_HOME";
- export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$ORACLE_HOME";
- }
- """))
-
Modified: CalendarServer/branches/users/cdaboo/better-next-job/setup.py
===================================================================
--- CalendarServer/branches/users/cdaboo/better-next-job/setup.py 2016-06-30 16:51:50 UTC (rev 15727)
+++ CalendarServer/branches/users/cdaboo/better-next-job/setup.py 2016-06-30 17:00:17 UTC (rev 15728)
@@ -26,7 +26,7 @@
import subprocess
import sys
-base_version = "9.0"
+base_version = "9.1"
#
Modified: CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_tables.py
===================================================================
--- CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_tables.py 2016-06-30 16:51:50 UTC (rev 15727)
+++ CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_tables.py 2016-06-30 17:00:17 UTC (rev 15728)
@@ -335,6 +335,8 @@
"""
for sequence in schema.model.sequences:
out.write('create sequence %s;\n' % (sequence.name,))
+ out.write("\n\n")
+
for table in schema:
# The only table name which actually exceeds the length limit right now
# is CALENDAR_OBJECT_ATTACHMENTS_MODE, which isn't actually _used_
@@ -421,7 +423,9 @@
for (cmodel, val) in row.items()])
out.write(_staticSQL(Insert(cmap)))
out.write(";\n")
+ out.write("\n\n" if len(table.model.schemaRows) else "\n")
+
for index in schema.model.indexes:
# Index names combine and repeat multiple table names and column names,
# so several of them conflict once oracle's length limit is applied.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160630/20550af0/attachment-0001.html>
More information about the calendarserver-changes
mailing list