From 697761cc337aa77a47140c8df50ed84bc25e23f6 Mon Sep 17 00:00:00 2001 From: Hans Petter Date: Thu, 11 Sep 2003 22:04:44 +0000 Subject: Import new libical from mainline HEAD and make appropriate changes to Evolution. svn path=/trunk/; revision=22538 --- calendar/ChangeLog | 33 + calendar/cal-util/Makefile.am | 4 +- calendar/cal-util/cal-component.c | 87 +- calendar/cal-util/cal-util.c | 10 +- calendar/gui/e-cal-model-calendar.c | 20 +- calendar/gui/e-cal-model-tasks.c | 6 +- calendar/gui/e-cal-model.c | 17 +- calendar/importers/Makefile.am | 6 +- calendar/pcs/cal-backend-file.c | 6 +- libical/AUTHORS | 5 +- libical/ChangeLog | 1186 +- libical/Makefile.am | 5 +- libical/NEWS | 75 + libical/README | 28 +- libical/THANKS | 17 +- libical/TODO | 4 +- libical/autogen.sh | 19 - libical/configure.in | 245 +- libical/design-data/.cvsignore | 5 +- libical/design-data/components.txt | 26 +- libical/design-data/parameters.csv | 15 +- libical/design-data/params-in-prop.txt | 8 +- libical/design-data/properties.csv | 56 +- libical/design-data/restrictions.csv | 86 +- libical/design-data/value-types.csv | 10 +- libical/doc/.cvsignore | 5 +- libical/doc/AddingOrModifyingComponents.txt | 23 + libical/doc/UsingLibical.lyx | 8 +- libical/examples/.cvsignore | 7 +- libical/examples/Makefile.am | 11 +- libical/examples/access-usecases.txt | 60 + libical/examples/access_components.c | 5 +- libical/examples/access_store.c | 210 + libical/examples/changenames.pl | 4 + libical/examples/usecases.c | 89 + libical/scripts/.cvsignore | 7 +- libical/scripts/mkderivedcomponents.pl | 2 +- libical/scripts/mkderivedparameters.pl | 75 +- libical/scripts/mkderivedproperties.pl | 92 +- libical/scripts/mkderivedvalues.pl | 33 +- libical/scripts/mkinclude.sh | 39 + libical/scripts/mkneticali.pl | 99 + libical/scripts/mkrestrictionrecords.pl | 2 +- libical/scripts/mkrestrictiontable.pl | 2 +- libical/scripts/readvaluesfile.pl | 3 + libical/src/.cvsignore | 5 +- libical/src/Makefile.am | 16 +- libical/src/Net-ICal-Libical/MANIFEST | 16 + libical/src/Net-ICal-Libical/Makefile.PL | 42 + libical/src/Net-ICal-Libical/README | 7 + .../src/Net-ICal-Libical/lib/Net/ICal/Libical.pm | 386 + .../lib/Net/ICal/Libical/Component.pm | 175 + .../lib/Net/ICal/Libical/Duration.pm | 160 + .../lib/Net/ICal/Libical/Period.pm | 359 + .../lib/Net/ICal/Libical/Property.pm | 173 + .../Net-ICal-Libical/lib/Net/ICal/Libical/Time.pm | 468 + libical/src/Net-ICal-Libical/netical.i | 317 + libical/src/Net-ICal-Libical/netical_wrap.c | 3048 ++ libical/src/Net-ICal-Libical/netical_wrap.doc | 393 + libical/src/Net-ICal-Libical/test-data/2446.mime | 3426 ++ libical/src/Net-ICal-Libical/test-data/error | 58 + .../src/Net-ICal-Libical/test-data/mail-examples | 262 + libical/src/Net-ICal-Libical/test-data/no-error | 26 + libical/src/Net-ICal-Libical/test-data/rfc2445.ics | 321 + libical/src/Net-ICal-Libical/test-data/rfc2446.ics | 1004 + .../Net-ICal-Libical/test-data/single-with-error | 39 + libical/src/Net-ICal-Libical/test/component.pl | 106 + libical/src/Net-ICal-Libical/test/libical.pl | 94 + libical/src/Net-ICal-Libical/test/swig.pl | 29 + libical/src/java/ICalDurationType.java | 114 + libical/src/java/ICalParameter.java | 259 + libical/src/java/ICalPeriodType.java | 71 + libical/src/java/ICalProperty.java | 507 + libical/src/java/ICalRecurrenceType.java | 284 + libical/src/java/ICalTimeType.java | 145 + libical/src/java/ICalTriggerType.java | 93 + libical/src/java/ICalValue.java | 209 + libical/src/java/Makefile.am | 51 + libical/src/java/VAgenda.java | 24 + libical/src/java/VAlarm.java | 24 + libical/src/java/VCalendar.java | 24 + libical/src/java/VComponent.java | 199 + libical/src/java/VEvent.java | 24 + libical/src/java/VFreeBusy.java | 18 + libical/src/java/VQuery.java | 24 + libical/src/java/VToDo.java | 24 + libical/src/java/jlibical_consts_cxx.h | 42 + libical/src/java/jlibical_utils_cxx.cpp | 458 + libical/src/java/jlibical_utils_cxx.h | 59 + libical/src/java/jniICalDurationType_cxx.cpp | 130 + libical/src/java/jniICalDurationType_cxx.h | 47 + libical/src/java/jniICalPeriodType_cxx.cpp | 144 + libical/src/java/jniICalPeriodType_cxx.h | 42 + libical/src/java/jniICalRecurrenceType_cxx.cpp | 347 + libical/src/java/jniICalRecurrenceType_cxx.h | 60 + libical/src/java/jniICalTimeType_cxx.cpp | 176 + libical/src/java/jniICalTimeType_cxx.h | 52 + libical/src/java/jniICalTriggerType_cxx.cpp | 111 + libical/src/java/jniICalTriggerType_cxx.h | 39 + .../src/java/net_cp_jlibical_ICalParameter_cxx.cpp | 310 + .../src/java/net_cp_jlibical_ICalParameter_cxx.h | 143 + .../src/java/net_cp_jlibical_ICalProperty_cxx.cpp | 1690 + .../src/java/net_cp_jlibical_ICalProperty_cxx.h | 654 + libical/src/java/net_cp_jlibical_ICalValue_cxx.cpp | 436 + libical/src/java/net_cp_jlibical_ICalValue_cxx.h | 182 + .../src/java/net_cp_jlibical_VComponent_cxx.cpp | 956 + libical/src/java/net_cp_jlibical_VComponent_cxx.h | 358 + libical/src/java/testjni.java | 377 + libical/src/libical/.cvsignore | 29 +- libical/src/libical/Makefile.am | 114 +- libical/src/libical/astime.h | 65 + libical/src/libical/caldate.c | 176 + libical/src/libical/icalarray.c | 24 +- libical/src/libical/icalarray.h | 18 +- libical/src/libical/icalattach.c | 139 + libical/src/libical/icalattach.h | 60 + libical/src/libical/icalattachimpl.h | 59 + libical/src/libical/icalcomponent.c | 1505 +- libical/src/libical/icalcomponent.h | 86 +- libical/src/libical/icalderivedparameter.c.in | 44 +- libical/src/libical/icalderivedparameter.h.in | 5 +- libical/src/libical/icalderivedproperty.c.in | 83 +- libical/src/libical/icalderivedproperty.h.in | 7 +- libical/src/libical/icalderivedvalue.c.in | 102 +- libical/src/libical/icalderivedvalue.h.in | 20 +- libical/src/libical/icalduration.c | 84 +- libical/src/libical/icalduration.h | 2 + libical/src/libical/icalenums.c | 39 +- libical/src/libical/icalenums.h | 11 +- libical/src/libical/icalerror.c | 67 +- libical/src/libical/icalerror.h | 25 +- libical/src/libical/icallangbind.c | 46 +- libical/src/libical/icallangbind.h | 5 + libical/src/libical/icalmemory.c | 148 +- libical/src/libical/icalmemory.h | 18 +- libical/src/libical/icalmime.c | 18 +- libical/src/libical/icalparameter.c | 109 +- libical/src/libical/icalparameter.h | 2 +- libical/src/libical/icalparameter_cxx.cpp | 289 + libical/src/libical/icalparameter_cxx.h | 159 + libical/src/libical/icalparser.c | 345 +- libical/src/libical/icalparser.h | 29 +- libical/src/libical/icalperiod.c | 21 +- libical/src/libical/icalperiod.h | 6 +- libical/src/libical/icalproperty.c | 457 +- libical/src/libical/icalproperty.h | 44 +- libical/src/libical/icalproperty_cxx.cpp | 702 + libical/src/libical/icalproperty_cxx.h | 365 + libical/src/libical/icalrecur.c | 820 +- libical/src/libical/icalrecur.h | 72 +- libical/src/libical/icalrestriction.c.in | 30 +- libical/src/libical/icalrestriction.h | 1 - libical/src/libical/icaltime.c | 975 +- libical/src/libical/icaltime.h | 263 +- libical/src/libical/icaltimezone.c | 463 +- libical/src/libical/icaltimezone.h | 94 +- libical/src/libical/icaltypes.c | 144 +- libical/src/libical/icaltypes.h | 40 +- libical/src/libical/icalvalue.c | 514 +- libical/src/libical/icalvalue.h | 27 +- libical/src/libical/icalvalue_cxx.cpp | 262 + libical/src/libical/icalvalue_cxx.h | 151 + libical/src/libical/icalvalueimpl.h | 34 +- libical/src/libical/icptrholder.h | 93 + libical/src/libical/pvl.c | 497 +- libical/src/libical/pvl.h | 37 +- libical/src/libical/sspm.c | 22 +- libical/src/libical/vcomponent.cpp | 817 + libical/src/libical/vcomponent.h | 340 + libical/src/libical/vsnprintf.c | 11 +- libical/src/libicalcap/Makefile.am | 77 + libical/src/libicalcap/client.c | 187 + libical/src/libicalcap/icalcap.c | 44 + libical/src/libicalcap/icalcap.h | 47 + libical/src/libicalcap/icalcap_impl.h | 34 + libical/src/libicalcap/icalcap_message.c | 225 + libical/src/libicalcap/icalcap_message_impl.h | 33 + libical/src/libicalcap/icalcap_rr.c | 545 + libical/src/libicalcap/icalcap_server.c | 52 + libical/src/libicalcap/icalcap_server.h | 19 + libical/src/libicalcap/icalcap_server_impl.h | 31 + libical/src/libicalcap/icalcap_session.c | 62 + libical/src/libicalcap/icalcap_session.h | 15 + libical/src/libicalcap/icalcap_session_impl.h | 36 + libical/src/libicalcap/icalcap_utils.c | 134 + libical/src/libicalss/.cvsignore | 6 +- libical/src/libicalss/Makefile.am | 117 +- libical/src/libicalss/icalbdbset.c | 1598 + libical/src/libicalss/icalbdbset.h | 147 + libical/src/libicalss/icalbdbset_cxx.h | 61 + libical/src/libicalss/icalbdbsetimpl.h | 41 + libical/src/libicalss/icalcalendar.c | 52 +- libical/src/libicalss/icalcalendar.h | 2 +- libical/src/libicalss/icalcaputil.h | 58 + libical/src/libicalss/icalclassify.c | 174 +- libical/src/libicalss/icalclassify.h | 36 +- libical/src/libicalss/icalcluster.c | 245 + libical/src/libicalss/icalcluster.h | 61 + libical/src/libicalss/icalclusterimpl.h | 45 + libical/src/libicalss/icaldirset.c | 518 +- libical/src/libicalss/icaldirset.h | 54 +- libical/src/libicalss/icaldirsetimpl.h | 19 +- libical/src/libicalss/icalfileset.c | 704 +- libical/src/libicalss/icalfileset.h | 96 +- libical/src/libicalss/icalfilesetimpl.h | 18 +- libical/src/libicalss/icalgauge.c | 172 +- libical/src/libicalss/icalgauge.h | 26 +- libical/src/libicalss/icalgaugeimpl.h | 12 +- libical/src/libicalss/icalmessage.c | 16 +- libical/src/libicalss/icalset.c | 528 +- libical/src/libicalss/icalset.h | 121 +- libical/src/libicalss/icalspanlist.c | 386 +- libical/src/libicalss/icalspanlist.h | 29 +- libical/src/libicalss/icalspanlist_cxx.cpp | 92 + libical/src/libicalss/icalspanlist_cxx.h | 53 + libical/src/libicalss/icalsslexer.l | 30 +- libical/src/libicalss/icalssyacc.h | 45 +- libical/src/libicalss/icalssyacc.y | 77 +- libical/src/libicalvcal/.cvsignore | 15 +- libical/src/libicalvcal/Makefile.am | 19 +- libical/src/libicalvcal/icalvcal.c | 67 +- libical/src/libicalvcal/icalvcal.h | 2 +- libical/src/libicalvcal/vcc.y | 9 +- libical/src/libicalvcal/vobject.c | 12 +- libical/src/python/.cvsignore | 9 +- libical/src/python/Attendee.py | 114 + libical/src/python/ChangeLog | 20 + libical/src/python/Component.py | 287 +- libical/src/python/DerivedProperties.py | 102 +- libical/src/python/Duration.py | 92 + libical/src/python/Error.py | 10 + libical/src/python/Gauge.py | 88 + libical/src/python/Libical.py | 17 +- libical/src/python/LibicalWrap.i | 231 +- libical/src/python/Makefile.am | 6 + libical/src/python/Period.py | 216 + libical/src/python/Property.py | 663 +- libical/src/python/Store.py | 55 +- libical/src/python/Time.py | 215 + libical/src/python/littlefile.txt | 3 + libical/src/python/python-binding.txt | 16 +- libical/src/python/test.py | 294 +- libical/src/test/.cvsignore | 25 +- libical/src/test/2445.ics | 326 + libical/src/test/2446.ics | 0 libical/src/test/Makefile.am | 41 +- libical/src/test/copycluster.c | 27 +- libical/src/test/findobj.c | 7 +- libical/src/test/itip.ics | 14 + libical/src/test/outgoing.ics | 544 + libical/src/test/process.c | 115 +- libical/src/test/recur.c | 151 +- libical/src/test/regression-classify.c | 187 + libical/src/test/regression-component.c | 580 + libical/src/test/regression-cxx.cpp | 137 + libical/src/test/regression-recur.c | 194 + libical/src/test/regression-storage.c | 804 + libical/src/test/regression-utils.c | 169 + libical/src/test/regression.c | 3028 +- libical/src/test/regression.h | 53 + libical/src/test/storage.c | 448 +- libical/src/test/stow.c | 114 +- libical/src/test/test_fileset.ics | 60 + libical/src/test/testclassify.c | 170 +- libical/src/test/testmime.c | 5 +- libical/test-data/.cvsignore | 6 +- libical/test-data/Makefile.am | 3 +- libical/test-data/calendar.ics | 20 +- libical/test-data/complex-mime-error.txt | 59 + libical/test-data/incoming.ics | 150 +- libical/test-data/large.ics | 40533 +++++++++++++++++++ libical/test-data/process-calendar.ics | 108 + libical/test-data/recur-errors.txt | 44 + libical/test-data/recur.txt | 330 +- libical/test-data/simple-mime.txt | 5 +- libical/test-data/spanlist.ics | 35 + shell/ChangeLog | 4 + shell/Makefile.am | 2 +- 278 files changed, 84067 insertions(+), 7999 deletions(-) create mode 100644 libical/doc/AddingOrModifyingComponents.txt create mode 100644 libical/examples/access-usecases.txt create mode 100644 libical/examples/access_store.c create mode 100644 libical/examples/changenames.pl create mode 100644 libical/examples/usecases.c create mode 100644 libical/scripts/mkinclude.sh create mode 100755 libical/scripts/mkneticali.pl create mode 100644 libical/src/Net-ICal-Libical/MANIFEST create mode 100644 libical/src/Net-ICal-Libical/Makefile.PL create mode 100644 libical/src/Net-ICal-Libical/README create mode 100644 libical/src/Net-ICal-Libical/lib/Net/ICal/Libical.pm create mode 100644 libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Component.pm create mode 100644 libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Duration.pm create mode 100644 libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Period.pm create mode 100644 libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Property.pm create mode 100644 libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Time.pm create mode 100644 libical/src/Net-ICal-Libical/netical.i create mode 100644 libical/src/Net-ICal-Libical/netical_wrap.c create mode 100644 libical/src/Net-ICal-Libical/netical_wrap.doc create mode 100644 libical/src/Net-ICal-Libical/test-data/2446.mime create mode 100644 libical/src/Net-ICal-Libical/test-data/error create mode 100644 libical/src/Net-ICal-Libical/test-data/mail-examples create mode 100644 libical/src/Net-ICal-Libical/test-data/no-error create mode 100644 libical/src/Net-ICal-Libical/test-data/rfc2445.ics create mode 100644 libical/src/Net-ICal-Libical/test-data/rfc2446.ics create mode 100644 libical/src/Net-ICal-Libical/test-data/single-with-error create mode 100644 libical/src/Net-ICal-Libical/test/component.pl create mode 100755 libical/src/Net-ICal-Libical/test/libical.pl create mode 100755 libical/src/Net-ICal-Libical/test/swig.pl create mode 100644 libical/src/java/ICalDurationType.java create mode 100644 libical/src/java/ICalParameter.java create mode 100644 libical/src/java/ICalPeriodType.java create mode 100644 libical/src/java/ICalProperty.java create mode 100644 libical/src/java/ICalRecurrenceType.java create mode 100644 libical/src/java/ICalTimeType.java create mode 100644 libical/src/java/ICalTriggerType.java create mode 100644 libical/src/java/ICalValue.java create mode 100644 libical/src/java/Makefile.am create mode 100644 libical/src/java/VAgenda.java create mode 100644 libical/src/java/VAlarm.java create mode 100644 libical/src/java/VCalendar.java create mode 100644 libical/src/java/VComponent.java create mode 100644 libical/src/java/VEvent.java create mode 100644 libical/src/java/VFreeBusy.java create mode 100644 libical/src/java/VQuery.java create mode 100644 libical/src/java/VToDo.java create mode 100644 libical/src/java/jlibical_consts_cxx.h create mode 100644 libical/src/java/jlibical_utils_cxx.cpp create mode 100644 libical/src/java/jlibical_utils_cxx.h create mode 100644 libical/src/java/jniICalDurationType_cxx.cpp create mode 100644 libical/src/java/jniICalDurationType_cxx.h create mode 100644 libical/src/java/jniICalPeriodType_cxx.cpp create mode 100644 libical/src/java/jniICalPeriodType_cxx.h create mode 100644 libical/src/java/jniICalRecurrenceType_cxx.cpp create mode 100644 libical/src/java/jniICalRecurrenceType_cxx.h create mode 100644 libical/src/java/jniICalTimeType_cxx.cpp create mode 100644 libical/src/java/jniICalTimeType_cxx.h create mode 100644 libical/src/java/jniICalTriggerType_cxx.cpp create mode 100644 libical/src/java/jniICalTriggerType_cxx.h create mode 100644 libical/src/java/net_cp_jlibical_ICalParameter_cxx.cpp create mode 100644 libical/src/java/net_cp_jlibical_ICalParameter_cxx.h create mode 100644 libical/src/java/net_cp_jlibical_ICalProperty_cxx.cpp create mode 100644 libical/src/java/net_cp_jlibical_ICalProperty_cxx.h create mode 100644 libical/src/java/net_cp_jlibical_ICalValue_cxx.cpp create mode 100644 libical/src/java/net_cp_jlibical_ICalValue_cxx.h create mode 100644 libical/src/java/net_cp_jlibical_VComponent_cxx.cpp create mode 100644 libical/src/java/net_cp_jlibical_VComponent_cxx.h create mode 100644 libical/src/java/testjni.java create mode 100644 libical/src/libical/astime.h create mode 100644 libical/src/libical/caldate.c create mode 100644 libical/src/libical/icalattach.c create mode 100644 libical/src/libical/icalattach.h create mode 100644 libical/src/libical/icalattachimpl.h create mode 100644 libical/src/libical/icalparameter_cxx.cpp create mode 100644 libical/src/libical/icalparameter_cxx.h create mode 100644 libical/src/libical/icalproperty_cxx.cpp create mode 100644 libical/src/libical/icalproperty_cxx.h create mode 100644 libical/src/libical/icalvalue_cxx.cpp create mode 100644 libical/src/libical/icalvalue_cxx.h create mode 100644 libical/src/libical/icptrholder.h create mode 100644 libical/src/libical/vcomponent.cpp create mode 100644 libical/src/libical/vcomponent.h create mode 100644 libical/src/libicalcap/Makefile.am create mode 100644 libical/src/libicalcap/client.c create mode 100644 libical/src/libicalcap/icalcap.c create mode 100644 libical/src/libicalcap/icalcap.h create mode 100644 libical/src/libicalcap/icalcap_impl.h create mode 100644 libical/src/libicalcap/icalcap_message.c create mode 100644 libical/src/libicalcap/icalcap_message_impl.h create mode 100644 libical/src/libicalcap/icalcap_rr.c create mode 100644 libical/src/libicalcap/icalcap_server.c create mode 100644 libical/src/libicalcap/icalcap_server.h create mode 100644 libical/src/libicalcap/icalcap_server_impl.h create mode 100644 libical/src/libicalcap/icalcap_session.c create mode 100644 libical/src/libicalcap/icalcap_session.h create mode 100644 libical/src/libicalcap/icalcap_session_impl.h create mode 100644 libical/src/libicalcap/icalcap_utils.c create mode 100644 libical/src/libicalss/icalbdbset.c create mode 100644 libical/src/libicalss/icalbdbset.h create mode 100644 libical/src/libicalss/icalbdbset_cxx.h create mode 100644 libical/src/libicalss/icalbdbsetimpl.h create mode 100644 libical/src/libicalss/icalcaputil.h create mode 100644 libical/src/libicalss/icalcluster.c create mode 100644 libical/src/libicalss/icalcluster.h create mode 100644 libical/src/libicalss/icalclusterimpl.h create mode 100644 libical/src/libicalss/icalspanlist_cxx.cpp create mode 100644 libical/src/libicalss/icalspanlist_cxx.h create mode 100644 libical/src/python/Attendee.py create mode 100644 libical/src/python/Duration.py create mode 100644 libical/src/python/Error.py create mode 100644 libical/src/python/Gauge.py create mode 100644 libical/src/python/Period.py create mode 100644 libical/src/python/Time.py create mode 100644 libical/src/python/littlefile.txt create mode 100644 libical/src/test/2445.ics create mode 100644 libical/src/test/2446.ics create mode 100644 libical/src/test/itip.ics create mode 100644 libical/src/test/outgoing.ics create mode 100644 libical/src/test/regression-classify.c create mode 100644 libical/src/test/regression-component.c create mode 100644 libical/src/test/regression-cxx.cpp create mode 100644 libical/src/test/regression-recur.c create mode 100644 libical/src/test/regression-storage.c create mode 100644 libical/src/test/regression-utils.c create mode 100644 libical/src/test/regression.h create mode 100644 libical/src/test/test_fileset.ics create mode 100644 libical/test-data/complex-mime-error.txt create mode 100644 libical/test-data/large.ics create mode 100644 libical/test-data/process-calendar.ics create mode 100644 libical/test-data/recur-errors.txt create mode 100644 libical/test-data/spanlist.ics diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a8c0b7b8bb..1113f7ea5d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,36 @@ +2003-09-11 Hans Petter Jansson + + * cal-util/Makefile.am (libcal_util_la_LIBADD): + libical-evolution.la -> libical.la + + * cal-util/cal-component.c (cal_component_get_classification) + (cal_component_set_classification) + (get_text_list) + (get_icaltimetype) + (get_datetime) + (get_period_list) + (get_recur_list) + (cal_component_get_transparency) + (cal_component_set_transparency): Adapt to new libical. + + * cal-util/cal-util.c (cal_util_event_dates_match): Ditto. + + * pcs/cal-backend-file.c (create_user_free_busy): Ditto. + + * gui/e-cal-model-tasks.c (get_completed) + (get_due) + (get_due_status): Ditto. + + * gui/e-cal-model.c (get_dtstart) + (set_classification): Ditto. + + * gui/e-cal-model-calendar.c (get_dtend) + (get_transparency) + (set_transparency): Adapt to new libical and fix a comparison bug. + + * importers/Makefile.am (libevolution_calendar_importers_la_LIBADD): + libical-evolution.la -> libical.la + 2003-09-11 Dan Winship * cal-util/Makefile.am (privlib_LTLIBRARIES): Remove diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am index 004946bdbf..d070271c0b 100644 --- a/calendar/cal-util/Makefile.am +++ b/calendar/cal-util/Makefile.am @@ -26,7 +26,7 @@ libcal_util_la_SOURCES = \ timeutil.c libcal_util_la_LIBADD = \ - $(top_builddir)/libical/src/libical/libical-evolution.la + $(top_builddir)/libical/src/libical/libical.la libcal_utilincludedir = $(privincludedir)/cal-util @@ -50,4 +50,4 @@ test_recur_LDADD = \ $(EVOLUTION_CALENDAR_LIBS) EXTRA_DIST = \ - cal-util-marshal.list \ No newline at end of file + cal-util-marshal.list diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c index 671af4a9ec..22b9ee310f 100644 --- a/calendar/cal-util/cal-component.c +++ b/calendar/cal-util/cal-component.c @@ -1536,7 +1536,7 @@ void cal_component_get_classification (CalComponent *comp, CalComponentClassification *classif) { CalComponentPrivate *priv; - const char *class; + icalproperty_class class; g_return_if_fail (comp != NULL); g_return_if_fail (IS_CAL_COMPONENT (comp)); @@ -1552,14 +1552,21 @@ cal_component_get_classification (CalComponent *comp, CalComponentClassification class = icalproperty_get_class (priv->classification); - if (strcasecmp (class, "PUBLIC") == 0) - *classif = CAL_COMPONENT_CLASS_PUBLIC; - else if (strcasecmp (class, "PRIVATE") == 0) - *classif = CAL_COMPONENT_CLASS_PRIVATE; - else if (strcasecmp (class, "CONFIDENTIAL") == 0) - *classif = CAL_COMPONENT_CLASS_CONFIDENTIAL; - else - *classif = CAL_COMPONENT_CLASS_UNKNOWN; + switch (class) + { + case ICAL_CLASS_PUBLIC: + *classif = CAL_COMPONENT_CLASS_PUBLIC; + break; + case ICAL_CLASS_PRIVATE: + *classif = CAL_COMPONENT_CLASS_PRIVATE; + break; + case ICAL_CLASS_CONFIDENTIAL: + *classif = CAL_COMPONENT_CLASS_CONFIDENTIAL; + break; + default: + *classif = CAL_COMPONENT_CLASS_UNKNOWN; + break; + } } /** @@ -1574,7 +1581,7 @@ void cal_component_set_classification (CalComponent *comp, CalComponentClassification classif) { CalComponentPrivate *priv; - char *str; + icalproperty_class class; g_return_if_fail (comp != NULL); g_return_if_fail (IS_CAL_COMPONENT (comp)); @@ -1595,26 +1602,26 @@ cal_component_set_classification (CalComponent *comp, CalComponentClassification switch (classif) { case CAL_COMPONENT_CLASS_PUBLIC: - str = "PUBLIC"; + class = ICAL_CLASS_PUBLIC; break; case CAL_COMPONENT_CLASS_PRIVATE: - str = "PRIVATE"; + class = ICAL_CLASS_PRIVATE; break; case CAL_COMPONENT_CLASS_CONFIDENTIAL: - str = "CONFIDENTIAL"; + class = ICAL_CLASS_CONFIDENTIAL; break; default: g_assert_not_reached (); - str = NULL; + class = ICAL_CLASS_NONE; } if (priv->classification) - icalproperty_set_class (priv->classification, str); + icalproperty_set_class (priv->classification, class); else { - priv->classification = icalproperty_new_class (str); + priv->classification = icalproperty_new_class (class); icalcomponent_add_property (priv->icalcomp, priv->classification); } } @@ -1622,7 +1629,7 @@ cal_component_set_classification (CalComponent *comp, CalComponentClassification /* Gets a text list value */ static void get_text_list (GSList *text_list, - const char *(* get_prop_func) (icalproperty *prop), + const char *(* get_prop_func) (const icalproperty *prop), GSList **tl) { GSList *l; @@ -1808,7 +1815,7 @@ cal_component_set_contact_list (CalComponent *comp, GSList *text_list) /* Gets a struct icaltimetype value */ static void get_icaltimetype (icalproperty *prop, - struct icaltimetype (* get_prop_func) (icalproperty *prop), + struct icaltimetype (* get_prop_func) (const icalproperty *prop), struct icaltimetype **t) { if (!prop) { @@ -2001,7 +2008,7 @@ cal_component_set_description_list (CalComponent *comp, GSList *text_list) /* Gets a date/time and timezone pair */ static void get_datetime (struct datetime *datetime, - struct icaltimetype (* get_prop_func) (icalproperty *prop), + struct icaltimetype (* get_prop_func) (const icalproperty *prop), CalComponentDateTime *dt) { if (datetime->prop) { @@ -2353,7 +2360,7 @@ cal_component_set_due (CalComponent *comp, CalComponentDateTime *dt) /* Builds a list of CalComponentPeriod structures based on a list of icalproperties */ static void get_period_list (GSList *period_list, - struct icaldatetimeperiodtype (* get_prop_func) (icalproperty *prop), + struct icaldatetimeperiodtype (* get_prop_func) (const icalproperty *prop), GSList **list) { GSList *l; @@ -2620,7 +2627,7 @@ cal_component_has_exdates (CalComponent *comp) /* Gets a list of recurrence rules */ static void get_recur_list (GSList *recur_list, - struct icalrecurrencetype (* get_prop_func) (icalproperty *prop), + struct icalrecurrencetype (* get_prop_func) (const icalproperty *prop), GSList **list) { GSList *l; @@ -3843,7 +3850,7 @@ void cal_component_get_transparency (CalComponent *comp, CalComponentTransparency *transp) { CalComponentPrivate *priv; - const char *val; + icalproperty_transp ical_transp; g_return_if_fail (comp != NULL); g_return_if_fail (IS_CAL_COMPONENT (comp)); @@ -3857,14 +3864,24 @@ cal_component_get_transparency (CalComponent *comp, CalComponentTransparency *tr return; } - val = icalproperty_get_transp (priv->transparency); + ical_transp = icalproperty_get_transp (priv->transparency); - if (strcasecmp (val, "TRANSPARENT") == 0) - *transp = CAL_COMPONENT_TRANSP_TRANSPARENT; - else if (strcasecmp (val, "OPAQUE") == 0) - *transp = CAL_COMPONENT_TRANSP_OPAQUE; - else - *transp = CAL_COMPONENT_TRANSP_UNKNOWN; + switch (ical_transp) + { + case ICAL_TRANSP_TRANSPARENT: + case ICAL_TRANSP_TRANSPARENTNOCONFLICT: + *transp = CAL_COMPONENT_TRANSP_TRANSPARENT; + break; + + case ICAL_TRANSP_OPAQUE: + case ICAL_TRANSP_OPAQUENOCONFLICT: + *transp = CAL_COMPONENT_TRANSP_OPAQUE; + break; + + default: + *transp = CAL_COMPONENT_TRANSP_UNKNOWN; + break; + } } /** @@ -3878,7 +3895,7 @@ void cal_component_set_transparency (CalComponent *comp, CalComponentTransparency transp) { CalComponentPrivate *priv; - char *str; + icalproperty_transp ical_transp; g_return_if_fail (comp != NULL); g_return_if_fail (IS_CAL_COMPONENT (comp)); @@ -3900,22 +3917,22 @@ cal_component_set_transparency (CalComponent *comp, CalComponentTransparency tra switch (transp) { case CAL_COMPONENT_TRANSP_TRANSPARENT: - str = "TRANSPARENT"; + ical_transp = ICAL_TRANSP_TRANSPARENT; break; case CAL_COMPONENT_TRANSP_OPAQUE: - str = "OPAQUE"; + ical_transp = ICAL_TRANSP_OPAQUE; break; default: g_assert_not_reached (); - str = NULL; + ical_transp = ICAL_TRANSP_NONE; } if (priv->transparency) - icalproperty_set_transp (priv->transparency, str); + icalproperty_set_transp (priv->transparency, ical_transp); else { - priv->transparency = icalproperty_new_transp (str); + priv->transparency = icalproperty_new_transp (ical_transp); icalcomponent_add_property (priv->icalcomp, priv->transparency); } } diff --git a/calendar/cal-util/cal-util.c b/calendar/cal-util/cal-util.c index 690bb57f6f..1e03c86d75 100644 --- a/calendar/cal-util/cal-util.c +++ b/calendar/cal-util/cal-util.c @@ -755,13 +755,19 @@ cal_util_event_dates_match (icalcomponent *icalcomp1, icalcomponent *icalcomp2) return FALSE; } + + /* now match the timezones */ if (!(!c1_dtstart.zone && !c2_dtstart.zone) || - (c1_dtstart.zone && c2_dtstart.zone && !strcmp (c1_dtstart.zone, c2_dtstart.zone))) + (c1_dtstart.zone && c2_dtstart.zone && + !strcmp (icaltimezone_get_tzid ((icaltimezone *) c1_dtstart.zone), + icaltimezone_get_tzid ((icaltimezone *) c2_dtstart.zone)))) return FALSE; if (!(!c1_dtend.zone && !c2_dtend.zone) || - (c1_dtend.zone && c2_dtend.zone && !strcmp (c1_dtend.zone, c2_dtend.zone))) + (c1_dtend.zone && c2_dtend.zone && + !strcmp (icaltimezone_get_tzid ((icaltimezone *) c1_dtend.zone), + icaltimezone_get_tzid ((icaltimezone *) c2_dtend.zone)))) return FALSE; return TRUE; diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c index 73ecaf3e94..82de4e6d5a 100644 --- a/calendar/gui/e-cal-model-calendar.c +++ b/calendar/gui/e-cal-model-calendar.c @@ -128,7 +128,7 @@ get_dtend (ECalModelComponent *comp_data) /* FIXME: handle errors */ cal_client_get_timezone (comp_data->client, - icaltimezone_get_tzid (icaltimezone_get_builtin_timezone (tt_end.zone)), + icaltime_get_tzid (tt_end), &zone); comp_data->dtend->zone = zone; } @@ -155,12 +155,14 @@ get_transparency (ECalModelComponent *comp_data) prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_TRANSP_PROPERTY); if (prop) { - const char *transp; + icalproperty_transp transp; transp = icalproperty_get_transp (prop); - if (strcasecmp (transp, "TRANSPARENT") == 0) + if (transp == ICAL_TRANSP_TRANSPARENT || + transp == ICAL_TRANSP_TRANSPARENTNOCONFLICT) return _("Free"); - else if (strcasecmp (transp, "OPAQUE") == 0) + else if (transp == ICAL_TRANSP_OPAQUE || + transp == ICAL_TRANSP_OPAQUENOCONFLICT) return _("Busy"); } @@ -251,12 +253,12 @@ set_transparency (ECalModelComponent *comp_data, const void *value) icalproperty_free (prop); } } else { - const char *transp; + icalproperty_transp transp; - if (strcasecmp (value, "FREE")) - transp = "TRANSPARENT"; - else if (strcasecmp (value, "OPAQUE")) - transp = "OPAQUE"; + if (!strcasecmp (value, "FREE")) + transp = ICAL_TRANSP_TRANSPARENT; + else if (!strcasecmp (value, "OPAQUE")) + transp = ICAL_TRANSP_OPAQUE; else { if (prop) { icalcomponent_remove_property (comp_data->icalcomp, prop); diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index deeb341512..6bca52586c 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -222,7 +222,7 @@ get_completed (ECalModelComponent *comp_data) /* FIXME: handle errors */ cal_client_get_timezone (comp_data->client, - icaltimezone_get_tzid (icaltimezone_get_builtin_timezone (tt_completed.zone)), + icaltime_get_tzid (tt_completed), &zone); comp_data->completed->zone = zone; } @@ -252,7 +252,7 @@ get_due (ECalModelComponent *comp_data) /* FIXME: handle errors */ cal_client_get_timezone (comp_data->client, - icaltimezone_get_tzid (icaltimezone_get_builtin_timezone (tt_due.zone)), + icaltime_get_tzid (tt_due), &zone); comp_data->due->zone = zone; } @@ -398,7 +398,7 @@ get_due_status (ECalModelTasks *model, ECalModelComponent *comp_data) } else { /* Get the current time in the same timezone as the DUE date.*/ status = cal_client_get_timezone (comp_data->client, - icaltimezone_get_tzid (icaltimezone_get_builtin_timezone (due_tt.zone)), + icaltime_get_tzid (due_tt), &zone); if (status != CAL_CLIENT_GET_SUCCESS) return E_CAL_MODEL_TASKS_DUE_FUTURE; diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 1f2e4a8f13..8a68cd07e5 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -336,7 +336,7 @@ get_dtstart (ECalModel *model, ECalModelComponent *comp_data) /* FIXME: handle errors */ cal_client_get_timezone (comp_data->client, - icaltimezone_get_tzid (icaltimezone_get_builtin_timezone (tt_start.zone)), + icaltime_get_tzid (tt_start), &zone); comp_data->dtstart->zone = zone; } @@ -476,11 +476,22 @@ set_classification (ECalModelComponent *comp_data, const char *value) icalproperty_free (prop); } } else { + icalproperty_class ical_class; + + if (!strcasecmp (value, "PUBLIC")) + ical_class = ICAL_CLASS_PUBLIC; + else if (!strcasecmp (value, "PRIVATE")) + ical_class = ICAL_CLASS_PRIVATE; + else if (!strcasecmp (value, "CONFIDENTIAL")) + ical_class = ICAL_CLASS_CONFIDENTIAL; + else + ical_class = ICAL_CLASS_NONE; + if (!prop) { - prop = icalproperty_new_class (value); + prop = icalproperty_new_class (ical_class); icalcomponent_add_property (comp_data->icalcomp, prop); } else - icalproperty_set_class (prop, value); + icalproperty_set_class (prop, ical_class); } } diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index 5f82341223..a1487c64a5 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -29,7 +29,7 @@ libevolution_calendar_importers_la_LDFLAGS = -avoid-version -module libevolution_calendar_importers_la_LIBADD = \ $(top_builddir)/shell/importer/libevolution-importer.la \ - $(top_builddir)/libical/src/libicalvcal/libicalvcal-evolution.la \ + $(top_builddir)/libical/src/libicalvcal/libicalvcal.la \ $(IMPORTERS_LIBS) # evolution_calendar_importer_SOURCES = \ @@ -43,8 +43,8 @@ libevolution_calendar_importers_la_LIBADD = \ # $(top_builddir)/calendar/cal-util/libcal-util.la \ # $(top_builddir)/calendar/cal-client/libcal-client.la \ # $(top_builddir)/libwombat/libwombat.la \ -# $(top_builddir)/libical/src/libical/libical-evolution.la \ -# $(top_builddir)/libical/src/libicalvcal/libicalvcal-evolution.la \ +# $(top_builddir)/libical/src/libical/libical.la \ +# $(top_builddir)/libical/src/libicalvcal/libicalvcal.la \ # $(EVOLUTION_CALENDAR_LIBS) server_in_files = GNOME_Evolution_Calendar_Importer.server.in.in diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c index 81697602d4..b26f2fd74c 100644 --- a/calendar/pcs/cal-backend-file.c +++ b/calendar/pcs/cal-backend-file.c @@ -1203,9 +1203,9 @@ create_user_free_busy (CalBackendFile *cbfile, const char *address, const char * prop = icalcomponent_get_first_property (icalcomp, ICAL_TRANSP_PROPERTY); if (prop) { - const char *transp_val = icalproperty_get_transp (prop); - if (transp_val - && !strcasecmp (transp_val, "TRANSPARENT")) + icalproperty_transp transp_val = icalproperty_get_transp (prop); + if (transp_val == ICAL_TRANSP_TRANSPARENT || + transp_val == ICAL_TRANSP_TRANSPARENTNOCONFLICT) continue; } diff --git a/libical/AUTHORS b/libical/AUTHORS index 659288c31d..ce25b7bd75 100644 --- a/libical/AUTHORS +++ b/libical/AUTHORS @@ -1 +1,4 @@ -Eric Busboom +John Gray +Andrea Campi + +Original author May 1998-December 2001, Eric Busboom diff --git a/libical/ChangeLog b/libical/ChangeLog index cb695bd4fa..97d25838f0 100644 --- a/libical/ChangeLog +++ b/libical/ChangeLog @@ -1,669 +1,308 @@ -2003-08-18 Rodrigo Moya +2002-07-09 Andrea Campi + + * src/libical/icalcomponent.c + * src/libical/icalcomponent.h: Added a check for valid component kind + before instancing a new one. + +2002-07-08 Andrea Campi + + * src/python/Gauge.py + * src/python/LibicalWrap.i + * src/python/Property.py + * src/python/Store.py + * src/python/Time.py + * src/python/python-binding.txt + * src/python/test.py: Updated the python bindings to match the C API + changes. + Obtained from: Mark Tearle + +2002-07-04 Andrea Campi + + * src/libical/icalderivedproperty.c.in + * src/libical/icalproperty.c + * src/libical/icalproperty.h: Added a check for valid property kind + before instancing a new one. + + * src/libical/icalvalue.c: Fixed icalvalue_new_clone to properly clone + X- properties. + +2002-06-28 Andrea Campi + + * design-data/parameters.csv + * src/libicalss/icalgauge.c + * src/libicalss/icalgaugeimpl.h + * src/libicalss/icalsslexer.c + * src/libicalss/icalsslexer.l + * src/libicalss/icalssyacc.c + * src/libicalss/icalssyacc.h + * src/libicalss/icalssyacc.y: Added IS NULL to icalgauge + syntax. + Obtained from: Paul Lindner + + * src/libical/icallexer.c + * src/libical/icallexer.l + * src/libical/icalyacc.c + * src/libical/icalyacc.h + * src/libical/icalyacc.y: Sent lex/yacc code to Attic. + + * src/libical/icalparameter.c: Changed icalparameter_as_ical_string + to also quote the param value if it contains a , (comma), as per RFC2445. + + * src/libicalss/icalset.c + * src/libicalss/icalset.h: Added experimental code to support + dynamic loading of icalset derived classes. + + * src/libicalss/Makefile.am + * src/libicalss/icalspanlist_cxx.cpp + * src/libicalss/icalspanlist_cxx.h: Added C++ binding for libicalss. + Obtained from: Paul Lindner + +2002-06-28 Eric Busboom + + * src/libical/Makefile.am + * src/libical/icalduration.c + * src/libical/icalparser.c + * src/libical/icalvalue.c + * src/libical/icalyacc.c + * src/libical/icalyacc.h: removed lex and yacc by writing + code to parse UTC-OFFSET + +2002-06-27 Andrea Campi + + * src/libical/icalcomponent.c + * src/libical/icalcomponent.h: Added icalcomponent_foreach_recurrence + as a better way of handling recurrences; deprecated + icalcomponent_get_span + Obtained from: Paul Lindner + + * src/libical/icalderivedvalue.c.in + * src/libical/icalvalue.c + * src/libical/icalvalue.h: Added a check for valid value kind before + instancing a new one. + Obtained from: Paul Lindner + + * src/libical/icalproperty.c + * src/libical/icalproperty.h: Deprecated icalproperty_remove_parameter, + added 3 new functions to do the same in a safer way (wrt X- params). + Obtained from: Paul Lindner + + * src/libical/icaltime.c + * src/libical/icaltime.h: Added functions to work with time spans. + Obtained from: Paul Lindner + +2002-06-26 Andrea Campi + + * src/libical/icalduration.c: Fixed icaldurationtype_from_int to + generate valid RFC2445 durations (it used to mix weeks and other + time units). + +2002-06-13 Andrea Campi + + * src/libical/icalvalue.c: Fixed escaping of TEXT values and + formatting of UTCOFFSET values to more closely match RFC2445. + + * configure.in + * src/libical/Makefile.am + * src/libical/icalparameter_cxx.cpp + * src/libical/icalparameter_cxx.h + * src/libical/icalproperty_cxx.cpp + * src/libical/icalproperty_cxx.h + * src/libical/icalvalue_cxx.cpp + * src/libical/icalvalue_cxx.h + * src/libical/vcomponent.cpp + * src/libical/vcomponent.h + * src/libicalss/icalbdbset_cxx.h: Added C++ binding. + Obtained from: Paul Lindner + + * configure.in + * src/libicalss/Makefile.am + * src/libicalss/icalbdbset.c + * src/libicalss/icalbdbset.h + * src/libicalss/icalbdbset.h + * src/libicalss/icalbdbsetimpl.h + * src/test/Makefile.am + * src/test/storage.c: Added BerkeleyDB 4.0 icalset implementation. + Obtained from: Paul Lindner + +2002-06-11 Andrea Campi + + * src/test/Makefile.am + * src/test/regression-classify.c + * src/test/regression-component.c + * src/test/regression-recur.c + * src/test/regression-utils.c + * src/test/regression.c + * src/test/regression.h + * src/test/test_fileset.ics: New regression test suite + Obtained from: Paul Lindner + + * src/libical/icalcomponent.c + * src/libical/icalproperty.c + * src/libical/icalproperty.h + * src/python/test.py + * src/test/regression.c: Improved X- parameter handling. + Obtained from: Mark Tearle + +2002-06-07 Andrea Campi + + * configure.in + * src/libical/Makefile.am + * src/libical/icallexer.l + * src/libical/icalparser.c + * src/libical/icalparser.h + * src/libical/icalyacc.y + * src/libicalss/Makefile.am + * src/libicalss/icalgauge.c + * src/libicalss/icalsslexer.c + * src/libicalss/icalsslexer.l + * src/libicalss/icalssyacc.c + * src/libicalss/icalssyacc.h + * src/libicalss/icalssyacc.y: Made parser fully reentrant using + recent versions of flex/bison. Also committed the generated files + so that the library can be compiled even without those tools. + Obtained from: Paul Lindner + + * src/python/LibicalWrap.i + * src/python/Property.py + * src/python/test.py: Support X- properties in the Python wrapper. + Obtained from: Mark Tearle + +2002-06-04 Andrea Campi + + * *: Constifed a lot of functions, also made a few of them static + Obtained from: Paul Lindner + +2002-06-03 Andrea Campi + * src/libical/icallangbind.c + * src/python/Component.py + * src/python/Gauge.py + * src/python/Libical.py + * src/python/LibicalWrap.i + * src/python/Store.py + * src/python/test.py: Fully implemented FileStore and Gauge + in the python bindings. + Obtained from: Mark Tearle + +2002-05-28 Andrea Campi + + * src/libical/icalattach.c + * src/libical/icalattach.h + * src/libical/icalattachimpl.h + * src/libical/icalderivedproperty.c.in + * src/libical/icalderivedvalue.c.in + * src/libical/icalderivedvalue.h.in + * src/libical/icaltypes.c + * src/libical/icaltypes.h + * src/libical/icalvalue.c + * src/libical/icalvalueimpl.h: Changed ATTACH to be an opaque type + +2002-05-27 Eric Busboom + + * scripts/mkderivedparameters.pl + * scripts/mkderivedproperties.pl + * scripts/mkderivedvalues.pl + * src/libical/icalderivedparameter.c.in + * src/libical/icalderivedparameter.h.in + * src/libical/icalderivedproperty.c.in + * src/libical/icalderivedproperty.h.in + * src/libical/icalderivedvalue.c.in + * src/libical/icalderivedvalue.h.in: changed the auto generated + files and scripts so that the generated code is inserted into the + middle of the template (.in) file, instead of the end. This means + we could get rid of the declaration for the maps. + +2002-05-27 Andrea Campi + + * src/libical/icaltimezone.c: Worked around Outlook/Exchange brokenness. + Obtained from: evolution CVS repository + +2002-05-24 Andrea Campi + + * src/libical/icalproperty.c: Implemented proper RFC2445 folding. + Obtained from: evolution CVS repository + + * src/libical/icalrecur.c: Worked around Outlook/Exchange brokenness. + Obtained from: evolution CVS repository + + +2002-05-21 Andrea Campi + + * src/libical/*: Removed void * in favor of opaque typedef types. + This helped uncover a few bugs and made debugging easier. + Obtained from: Paul Lindner + +2002-05-10 Andrea Campi + + * src/libical/icalmemory.c: Made the memory allocator threadsafe. + This code is currently conditional on USE_THREAD, but it might + become the default in the future. + Obtained from: Paul Lindner + + * src/libical/icaltime.c: Implemented icaltime_is_date(), with the + intent of removing all direct accesses to is_date. + +2002-05-09 Andrea Campi - * src/libical/icalcomponent.c (icalcomponent_set_uid): added missing - implementation. + * icaltime.c Rewrote and documented icaltime API, with the goal of + keeping it stable until release 1.0. Some functions and internal + implementation details are now declared obsolete and removed from + the documentation; they will be removed at a later time. + +2001-12-12 Eric Busboom + + * icalrecur.c implemented recurrence rule for "FREQ=YEARLY", + with no BY rules. -2003-08-07 Rodrigo Moya +2001-12-11 Eric Busboom - * src/libical/icalcomponent.c (icalcomponent_get_uid): added missing - implementation. + * icalrecur.c Fixed bug in next_month for MONTHLY rules that have + only BYDAY rules. The code would miss valid dates that fell on the + first of the month. created new routine is_day_in_byday() -2003-05-14 Rodrigo Moya + * icaltime.c Fixed icaltime_from_day_of_year to correctly handle + negative and over-range day-of-years - Fixes #41579 + * icaltime.c collected all instances of leap year code into + icaltime_is_leap_year - * src/libical/icalcomponent.c (icalcomponent_new_clone): don't add the - property if it's NULL. + * icaltime.c icaltime_day_of_year. Changed an assert into code + that advances the year when the day of year is lager than the + number of days in the given year -2003-05-07 Rodrigo Moya + * icalerrno.c,h Added the function version + icalerror_set_errno. Only the define verson existed. - Fixes crash in #41631 - - * src/libicalvcal/icalvcal.c (icalvcal_traverse_objects): changed to - return an error code and to return immediately if one of the recurrent - calls return an error. - (icalvcal_convert_with_defaults): if icalvcal_traverse_objects return - an error, return NULL. - -2003-03-17 Hans Petter Jansson - - Part of fix for #34095 - - * scripts/mkderivedparameters.pl: Generate code to free old - string value when a new one is set. - - * src/libical/icalperiod.c (icalperiodtype_as_ical_string): - Callers expect a temporary string, and thus won't free it, so - allocate returned memory from the temporary ring. - -2003-02-10 Ettore Perazzoli - - * src/libical/Makefile.am (libical_static_la_DEPENDENCIES): Make - libical-static.la depend on libical-evolution.la so they they are - not built in parallel by a parallel make, since that would break - libtool. - -2003-02-07 Christian Neumair - - * .cvsignore: Added missing files. - * configure.in: Added AC_PREREQ as defined in ../configure.in. - -2003-02-06 Dan Winship - - * configure.in: AC_SUBST privlibdir, privincludedir, privdatadir - (sent from ../configure). Add descriptions to AC_DEFINEs. Don't - bother checking for python since we don't build it anyway. - - * acconfig.h: Gone - - * src/libical/Makefile.am: install library in privlibdir and - headers under privincludedir. Look for zone files in privdatadir - - * src/libicalvcal/Makefile.am: install in privlibdir - - * zoneinfo/Makefile.am (zoneinfodatadir): define in terms of - privdatadir - (install-data-local): update - -2002-12-19 Joe Shaw - - * configure.in: Add AC_CONFIG_AUX_DIR(..) so it looks for ylwrap in - the toplevel evolution directory and not our directory. Fixes the - build for automake >= 1.5 - -2002-11-26 Rodrigo Moya - - * src/libical/icalyacc.y: added missing ';' for new bison to not - complain. - -2002-10-25 Dan Winship - - * src/libical/icaltimezone.c - (icaltimezone_get_vtimezone_properties): Free the location if it's - set. Otherwise one copy of the location of each built-in timezone - we use gets leaked. - -2002-10-15 Rodrigo Moya - - Fixes #25153 - - * scripts/mkderivedvalues.pl: changed the _get functions for - string values to return a NULL if arguments are wrong - - * src/libical/icalderivedvalue.c.in (icalvalue_get_x): return from - function if pointer checking fails. - -2002-10-01 Ettore Perazzoli - - * src/libicalvcal/vcc.y: Allocate the right number of bytes when - appending the string value [it was allocating one fewer than - necessary]. [#28321] - -2002-06-18 JP Rosevear - - * Update timezones (from Damon) - -2002-06-07 JP Rosevear - - * src/libical/icalparameter.c (icalparameter_as_ical_string): - quote if the item contains a comma - -2002-04-01 Dan Winship - - Darwin/OS portability from Max Horn - - * src/libical/icallangbind.c: #include , not - - * src/libicalvcal/vobject.c: Likewise - - * src/libicalvcal/vcc.y: Likewise - - * src/libicalss/icaldirset.c: Rearrange #includes slightly to make - Darwin happy. - -2002-02-08 Damon Chaplin - - * src/Makefile.am (SUBDIRS): added libicalvcal. - - * configure.in (AC_OUTPUT): added src/libicalvcal/Makefile. - -2002-02-06 Damon Chaplin - - * src/libicalvcal/icalvcal.c: major changes to support RRULE/EXRULE, - VALARMS and several other properties. - - * src/libicalvcal/icalvcal.h (icalvcal_convert_with_defaults): new - function to pass defaults for a few values into the importer. These - are used when the vCalendar file doesn't provide the property but it - is required in iCalendar. - - * src/libicalvcal/vcc.y: support multi-valued properties, by appending - new ones and separating by ';'. This was pinched from our changes to - evolution/libversit/vcc.y. - - * src/libicalvcal/Makefile.am: renamed library to libicalvcal-evolution - Don't install the headers. - - * design-data/parameters.csv: added new error for error's parsing - vCalendar properties. - -2002-01-28 Dan Winship - - * src/libical/icalrecur.c (icalrecur_add_bydayrules): Skip over - illegal whitespace in Microsoft-generated BYDAY rules. - -2001-12-18 Damon Chaplin - - * src/libical/icalyacc.y: removed unused 'trigger:' production. - - * configure.in (AC_OUTPUT): patch from Jeremy Katz - to remove src/libicalss/Makefile and src/libicalvcal/Makefile, as we - don't ship those directories now. - -2001-12-10 Damon Chaplin - - * src/libical/icaltimezone.c (icaltimezone_get_display_name): if all - we have is the TZID, see if it is one of our TZIDs and if so get the - city name out of it. Fixes bug #16571. - -2001-11-13 Damon Chaplin - - * src/libical/icaltimezone.c (icaltimezone_get_tzid): initialize the - builtin timezones, to ensure that the TZID of the UTC zone is set. - Hopefully fixes bugs #14941 & #14622. - -2001-10-31 Damon Chaplin - - * src/libical/icalproperty.c (get_next_line_start): use MAX_LINE_LEN - rather than magic numbers all over the place. - -2001-10-31 Damon Chaplin - - * src/libical/icalproperty.c (icalproperty_as_ical_string): had to - redo the folding code since Outlook 2000 doesn't like parameter values - like 'TENTATIVE' cut in half. Now it tries to split after a ';', ':' - or space. - -2001-10-30 Damon Chaplin - - * src/libical/icalproperty.c (fold_property_line): forgot to account - for the spaces added, so it could have been writing over the end of - the allocated memory. Added check for buffer overflow as well. - This could well have been the problem causing bug #14067. - -2001-10-30 Damon Chaplin - - * zoneinfo/*.ics: Regenerated all VTIMEZONEs, to be compatable with - Outlook Web Access. They now only include 2 RRULEs components or - 1 simple DTSTART component. - -2001-10-29 Damon Chaplin - - * src/libical/Makefile.am: renamed the library to libical-evolution.la, - install ical.h into $includedir/evolution, with the other Evo headers. - - * src/libical/icalproperty.c (fold_property_line): new function to - fold property lines around every 70 characters. Outlook Web Access - doesn't seem to like some properties folded after the property name - (e.g. UID, VTIMEZONE stuff.) Slight chance of data corruption here. - - * src/libical/icalvalue.c (icalvalue_text_as_ical_string): don't fold - the lines here. - - * src/libical/icaltime.c (icaltime_from_string): DATE values should - not have is_utc set to 1 - they don't have a timezone. - - * src/libical/icalvalue.c (icalvalue_utcoffset_as_ical_string): - always round UTC offsets to the nearest minute, for compatability - with Outlook. Should round data when parsing as well. - -2001-10-27 Damon Chaplin - - * src/libical/icaltimezone.c (icaltimezone_get_display_name): added - function to get a reasonable name to display for the timezone. - (Though it won't be translated.) - -2001-10-25 Damon Chaplin - - * src/libical/icaltimezone.c (icaltimezone_get_tznames_from_vtimezone): - Outlooks (2000) places "Standard Time" and "Daylight Time" in the - TZNAME strings, which is useless, so return NULL in that case. - ETimezoneEntry will then use the TZID instead, in which Outlook does - place the actual timezone name. (I just hope Outlook doesn't translate - "Standard Time" to other languages, as we won't be able to fix it then) - -2001-10-23 Damon Chaplin - - * src/libical/icalrecur.c (icalrecur_two_byrule): use - sizeof(test_array) for the memset call. It was clearing 9 bytes but - the array uses shorts. - -2001-10-22 Damon Chaplin - - * zoneinfo/*: updated all files again, placing current RDATEs first, - so Outlook uses those. Also fixed a few bugs in vzic which resulted in - a few changes. - - * zoneinfo/Makefile.am (DIRS): added America/North_Dakota. - -2001-10-22 Damon Chaplin - - * src/libical/icaltimezone.c (icaltimezone_get_utc_offset): - (icaltimezone_get_utc_offset_of_utc_time): if we go off the start of - the changes array, return the TZOFFSETFROM of the first change. - Also changed the maximum year to 2037. - - * src/libical/icaltime.c (icaltime_day_of_week): - (icaltime_start_doy_of_week): - (icaltime_week_number): init tm_hour to 12. Sometimes mktime() - adjusts the time, if that local time doesn't actually exist, leading - to the wrong day being returned. It is unlikely to adjust by 12 hours. - (icaltime_as_timet_with_zone): - (icaltime_from_timet_with_zone): change it back so it does convert - DATE values to/from the timezone. time_t values don't really go well - with DATE values, so be very careful when using them. We now assume - that the time_t points to the start of the day in the given timezone. - (We used to assume it pointed to the start of the day in UTC, but - that meant it was actually incorrect wrt the displayed calendar.) - - * src/libical/icalrecur.c (expand_year_days): for FREQ=YEARLY with no - modifiers, we add one day, using the month and day from DTSTART. - (next_year): make sure we never go past 2037. - - * scripts/mkderivedproperties.pl: Updated to allow DTSTART, DTEND, DUE - and RECURRENCE-ID to be set with DATE values. I think it now handles - all properties which can take DATE values, except RDATE which uses - DATE-TIME-PERIOD. - -2001-10-19 JP Rosevear - - * src/libical/icalproperty.c (icalproperty_remove_parameter): - don't free the parameter - -2001-10-05 Ettore Perazzoli - - * src/libical/Makefile.am (CLEANFILES): Assign with `=', not `+='. - -2001-09-26 Federico Mena Quintero - - Fix the libical-related part of Ximian bug #7892. - - * src/libical/icalduration.c (icaldurationtype_as_ical_string): - The correct string for zero seconds is "PT0S", not "PTS0". Also - handle "negative zero" durations. - - * src/libical/icalvalue.c (icalvalue_new_from_string_with_error): - Use icalerrno to see if the duration string is invalid. We cannot - use icaldurationtype_is_null_duration() because a duration of zero - *is* valid, not an error (icalduration_type_from_string() returns - a zero duration on parse error, too). - -2001-09-19 Larry Ewing - - * src/libical/icalperiod.c (icalperiodtype_from_string): free the - temp dup'd string. - -2001-09-11 Federico Mena Quintero - - * src/libical/icalvalue.c (icalvalue_new_from_string_with_error): - Generate an ICAL_ATTACH_VALUE value from the string. - -2001-09-10 Damon Chaplin - - * src/libical/icalcomponent.c (icalcomponent_compare_vtimezones): - strdup the result of the first call to ical_component_as_ical_string() - since the second call may free it. - Also, don't free the results of ical_component_as_ical_string() since - it is a tmp buffer which is freed elsewhere. - -2001-09-10 Federico Mena Quintero - - Replace struct icalattachtype by an opaque icalattach that is - properly reference-counted. - - * src/libical/icalvalueimpl.h (struct icalattach_impl): Private - declaration for the icalattach type. - (struct icalvalue_impl): Make the v_attach field be an icalattach *. - - * src/libical/icaltypes.h: Added declaration for icalattach. This - is now an opaque type; the implementation is in icalvalueimpl.h. - (struct icalattachtype): Removed. - - * src/libical/icaltypes.c (icalattach_new_from_url): New function. - (icalattach_new_from_data): New function. - (icalattach_ref): New function. - (icalattach_unref): New function. - (icalattach_get_is_url): New function. - (icalattach_get_url): New function. - (icalattach_get_data): New function. - (icalattachtype_new): Removed. - (icalattachtype_free): Removed. - (icalattachtype_add_reference): Removed. - (icalattachtype_set_url): Removed. - (icalattachtype_get_url): Removed. - (icalattachtype_set_base64): Removed. - (icalattachtype_get_base64): Removed. - (icalattachtype_set_binary): Removed. - (icalattachtype_get_binary): Removed. - - * src/libical/icalderivedvalue.c.in (icalvalue_new_attach): New - function; we implement it ourselves. - (icalvalue_set_attach): New function. - (icalvalue_get_attach): New function. - - * src/libical/icalvalue.c (icalmemory_strdup_and_dequote): Made - static. - (icalvalue_new_clone): Clone BINARY and ATTACH values by refing - the old attach value. - (icalvalue_free): Free BINARY and ATTACH values. - (icalvalue_attach_as_ical_string): Handle the new icalattachtype. - (icalvalue_compare): Ditto. - - * src/libical/Makefile.am (CLEANFILES): Added ical.h. - - * design-data/*: Mark ATTACH as a custom value. - -2001-09-06 Damon Chaplin - - * src/libical/icalcomponent.c (icalcomponent_merge_vtimezone): pass - the VTIMEZONE component to icalcomponent_compare_vtimezones(), not - the icaltimezone*. Strangely we weren't getting a compiler error. - Fixes bug #5275, hopefully. - - * src/libical/icaltimezone.c (icaltimezone_dump_changes): updated so - it still outputs the same format, even though the '1 Jan 0001' - component isn't included any more. - -2001-08-31 Damon Chaplin - - * zoneinfo/*: updated all of the VTIMEZONE files to try to be more - compatable with Outlook. i.e. We don't use seconds in UTC offsets, - we don't use BYMONTHDAY if we can avoid it (there are still a few uses - of this we need to fix), and we don't use years < 1600. - - * src/libical/icalvalue.c (icalvalue_utcoffset_as_ical_string): if - seconds is 0 then don't output it. None of the builtin VTIMEZONE data - uses the seconds value any more, since it messes up iTIP with Outlook. - We may want to make it always round to the nearest minute, to avoid - interop problems. - -2001-08-22 Ettore Perazzoli - - * configure.in: Remove src/python/Makefile and src/test/Makefile. - -2001-08-16 Federico Mena Quintero - - * src/libical/icalvalue.c (icalmemory_strdup_and_dequote): Dequote - the same characters that we know how to quote in - icalvalue_text_as_ical_string(). Fixes Ximian bug #7433. - -2001-08-01 Damon Chaplin - - * src/libical/icaltimezone.c: removed some debugging messages. - -2001-07-30 Damon Chaplin - - * src/libical/icaltimezone.c (icaltimezone_get_builtin_timezone): - changed the debugging message to avoid a crash on non-glibc boxes. - (Using %s with a NULL argument will crash them.) - -2001-07-30 Damon Chaplin - - * src/libical/icalcomponent.c (icalcomponent_merge_vtimezone): copy - the TZID just in case the property we got it from gets modified. - (icalcomponent_rename_tzids_callback): break out of the loop if we - have renamed the TZID parameter. Otherwise our tzid variable would be - invalid. - - * scripts/mkderivedproperties.pl (fudge_data): changed this so we can - set EXDATEs that are DATE values, by checking the is_date field. - I'm not entirely sure this is the way it should be done. - If it is, I'll also do this for other things like DTSTART/DTEND. - - * src/libical/icalrecur.c (icalrecurrencetype_as_string): handle - UNTIL as a DATE value as well as a DATE-TIME. - - * src/libical/icalcomponent.c (icalcomponent_compare_vtimezones): - fixed stupid error, getting TZID property from wrong VTIMEZONE. - This would only have affected iTIP stuff, with VTIMEZONEs that don't - use the '/' prefix (i.e. from Outlook). It probably just meant we - kept multiple copies of the same VTIMEZONE. - - * src/libical/icaltimezone.c: removed some debugging messages. - -2001-07-26 JP Rosevear - - * src/libical/icalcomponent.c (icalcomponent_begin_component): - call pvl_next on i rather than itr.iter - -2001-07-26 Damon Chaplin - - * src/libical/icaltimezone.c (icaltimezone_convert_time): if from_zone - is NULL (i.e. it is a floating time), just return. - -2001-07-25 Damon Chaplin - - * src/libical/icaltimezone.c: accept an icaltimezone* of NULL for all - the public functions, since NULL is used to represent floating times. - -2001-07-25 JP Rosevear - - * src/libical/icalparameter.c (icalparameter_as_ical_string): if - the property contains ':' or ';' put the value in quotes so it - parses correctly - -2001-07-23 JP Rosevear - - * src/libical/icalparser.c: pass extra param to - icalparser_get_next_char - (icalparser_get_next_char): only use quote mode if the flag is set - -2001-07-23 Damon Chaplin - - * src/libical/icaltime.c (icaltime_day_of_year): changed so it doesn't - use mktime(). We are having problems because mktime() only works - post 1970. - -2001-07-17 JP Rosevear - - * src/libical/icaltimezone.c - (icaltimezone_get_tznames_from_vtimezone): do not strdup a NULL - (valid) timezone - -2001-07-16 Damon Chaplin - - * src/libical/icaltimezone.c - (icaltimezone_get_location_from_vtimezone): return NULL if we - couldn't find the LOCATION. - (icaltimezone_get_utc_offset): ifdef'd out a debugging message. - (icaltimezone_get_location): - (icaltimezone_get_latitude): - (icaltimezone_get_longitude): don't load the builtin timezone for - these. We should already have the data from reading zones.tab. - (icaltimezone_get_builtin_timezone_from_tzid): return NULL if the - TZID given is NULL or "" (i.e. a floating time). - -2001-07-10 Peter Williams - - * src/libicalss/Makefile.am (libicalss_la_SOURCES): Add the - COMBINEDHEADERS here and remove the EXTRA_DIST. This fixes distcheck. - We can't just put CONBINEDHEADERS at the bottom of _SOURCES because - of the $(srcdir). - -2001-07-11 Damon Chaplin - - * src/libical/icaltimezone.c: only create the timezones array when we - need to, and make sure we free things when necessary. - Also added timezones_sorted variable, which we set to 0 when adding a - timezone. We then sort the array before doing binary searches (oops!) - - * src/libical/icaltimezone.[hc]: added free_struct() arg to - icaltimezone_free() to specify whether to free the icaltimezone struct. - Also added icaltimezone_array_free() function. - -2001-07-10 Damon Chaplin - - * src/libical/icaltimezone.c (icaltimezone_convert_time): don't convert - DATE values. - - * src/libical/icaltime.c (icaltime_from_timet_with_zone): - (icaltime_as_timet_with_zone): changed so they do not convert DATE - values according to the timezone. - - * src/libical/icaltime.[hc]: added icaltime_current_time_with_zone() - and icaltime_today() functions. - -2001-07-09 Damon Chaplin - - * src/libical/icaltime.c (icaltime_adjust): forgot to compile before - committing. Idiot. - -2001-07-09 Damon Chaplin - - * src/libical/icaltimezone.c (icaltimezone_convert_time): if the 2 - zones are the same just return. - - * src/libical/icaltime.c (icaltime_adjust): normalize the month. - -2001-07-03 Damon Chaplin - - * src/libical/icalcomponent.c (icalcomponent_add_component): add the - icaltimezone to the timezone array of the toplevel VCALENDAR component. - -2001-07-03 Damon Chaplin - - * src/libical/icalcomponent.c (icalcomponent_merge_component): fixed - bad assertion, '!=' -> '=='. - (icalcomponent_merge_vtimezone): get the TZID from vtimezone, not comp. - -2001-07-03 Damon Chaplin - - * src/libical/icaltime.c: - * src/libical/icalcomponent.c: more timezone stuff. - -2001-06-28 Peter Williams - - * zoneinfo/Makefile.am (dist-hook): Add $(srcdir) as in install-data-local - rule. - -2001-06-28 Damon Chaplin - - * configure.in: commented out AC_DEFINE(ICAL_ERRORS_ARE_FATAL,1). - We only want it to abort when there is no possibility of carrying on. - -2001-06-26 Damon Chaplin - - * zoneinfo/*: stripped all blank lines from iCalendar files. - Apparently they aren't exactly legal. Oops. - -2001-06-15 JP Rosevear - - * zoneinfo/Makefile.am: Extra dist the zones.tab information - -2001-06-14 Damon Chaplin - - * src/libical/icaltimezone.c (icaltimezone_get_latitude): - (icaltimezone_get_longitude): added functions to get the coords of - builtin timezones. - -2001-06-13 Damon Chaplin - - * src/libical/icalrecur.c: merged in some new stuff from libical CVS. - (icalrecur_add_byrules): If no sign is given set sign to 1 (i.e. - default to positive). - (icalrecur_iterator_new): when setting up the year days array, handle - the case where a year has no occurrences and we have to skip it. - Also initialize the last.day and last.month fields. - (expand_by_day): set the last day of the year explicitly rather than - adding 1 to year and subtracting 1 from day. It is more efficient, - and less prone to bugs. Also rewrote a bit. - (expand_year_days): added code to handle BY_MONTH_DAY and BY_DAY + - BY_MONTH_DAY, and rewrote code to handle BY_DAY + BY_MONTH. - (next_year): handled the case where there are no occurrences in the - year. - - * src/libical/icaltime.c (icaltime_adjust): new function to adjust a - time by a number of days/hours/minutes/seconds. - (icaltime_day_of_week): rewrote using a single call to mktime(). - (icaltime_day_of_year): rewrote using a single call to mktime(). - (icaltime_from_day_of_year): rewrote in a simpler way. The old version - had a bug in it. + * icaltime.c Moved all of the getenv/putenv operations into icaltimegm() - * src/libical/icaltime.h (struct icaltimetype): added is_daylight - flag, so we can try to distinguish between standard and daylight time - when the clocks go back. Though this doesn't always resolve the - ambiguity. - - * src/libical/icalcomponent.c: added some stuff to handle timezone - data connected to the calendar component. Unfinished. - - * src/libical/icalyacc.y: merged in a fix from sourceforge CVS version - of libical, so we can handle -ve UTC offsets. - - * src/libical/Makefile.am (CPPFLAGS): added PACKAGE_DATA_DIR define - for finding the VTIMEZONE files. - (libical_la_SOURCES): added icalarray.[hc] and icaltimezone.[hc]. - (COMBINEDHEADERS): added icalarray.h and icaltimezone.h to the headers - to be combined into ical.h. - -2001-06-13 Damon Chaplin - - * src/libical/icaltimezone.[hc]: new files to contain support for - timezones. - - * src/libical/icalarray.[hc]: new files to provide a simple expanding - array datatype. - -2001-06-13 Damon Chaplin - - * Makefile.am (SUBDIRS): added zoneinfo. - - * configure.in (AC_OUTPUT): added zoneinfo/Makefile. +2001-06-29 Eric Busboom - * zoneinfo/Makefile.am: new file to install & distribute the - VTIMEZONE data files, and the zones.tab file. + * icalderivedproperties.h,c Changed the signature if the CLASS + property from TEXT to CLASS. ( enum icalproperty_class) - * zoneinfo/zones.tab: new file containing a list of all timezones - and their coordinates (so we can mark them on the world map). +2001-06-22 Eric Busboom - * zoneinfo/*: Lots of VTIMEZONE data files added, one per timezone. + * icaltypes.c Fixed bug in icaltriggertype_new_from_string htat + caused it to fail. -2001-05-16 JP Rosevear +2001-04-12 Eric Busboom - * src/libical/Makefile.am: Fixes to make it make dist and make - distcheck. Kind of kludgy but they seem to work. Time will tell. + * icalvalue.c Added quoting to apostrophies ("'") in text + values. This is not required by the spec, but it is necessary in + icallangbind_property_eval_string, since ' is special in both perl + and python. -2001-05-10 JP Roseveaer +2001-04-10 Eric Busboom - * src/libical/icaltime.c (set_tz, unset_tz): plug leak - (icaltime_as_timet): use altered functions - (icaltime_utc_offset): ditto - (icaltime_from_day_of_year): ditto + * icalvalue.c Added routine icalvalue_reset_kind. This routine is + now called by all autogenerated icalvalue_set_* + routines. icalvalue_reset_kind() will change the kind of the value + based on the data in the value. Currently, it will set a value to + either DATETIME or DATE based on the is_date flag of icaltimetype. -2001-05-02 JP Rosevear +2001-04-09 Eric Busboom - * src/libical/icalparser.c (icalparser_new): initialize - "continuation_line" to 0 - -2001-04-18 Ettore Perazzoli - - * src/Makefile.am (SUBDIRS): Don't compile the Python stuff nor - the tests for now; they are broken. - -2001-04-18 Ettore Perazzoli - - * src/libicalss/Makefile.am (COMBINEDHEADERS): All of these have - to come from the srcdir: prepend `$(srcdir)'. - -2001-04-18 Ettore Perazzoli - - * src/libical/Makefile.am (COMBINEDHEADERS): Shouldn't prepend - `$(top_builddir)/src/libical' to `icalderivedvalue.h', - `icalderivedparameter.h', `icalderivedproperty.h' here, that - confuses the dependencies for make. - - * src/libical/Makefile.am (ical.h): Depend on - `$(COMBINEDHEADERS)', not `$(BUILT_SOURCES)'. + * icalproperty.h Converted REQUEST-STATUS to use the struct + icalreqstat structure instead of a string 2001-04-01 Eric Busboom @@ -822,10 +461,6 @@ than on standard value type. These non-standard types now delegate to stadard types. -2001-01-24 Dan Winship - - * src/libical/icaltime.c: Remove unused "extern long timezone". - 2001-01-24 Eric Busboom * icalfileset.c fixed icalfileset_read-from_file so it will handle @@ -875,72 +510,6 @@ * icalgauge.c icalgaugeimpl.h, icalgauge.h., Rewrote gauge code to use pvl-lists directly, instead of trying to reuse icalcomponent. -2000-12-15 Ettore Perazzoli - - * src/libical/Makefile.am: Build `libical-static.la'. - -2000-12-14 Ettore Perazzoli - - * src/libical/Makefile.am (ical.h): - -2000-12-13 Federico Mena Quintero - - * src/libical/icaltime.c (icaltime_from_timet): Use gmtime() - unconditionally, since we want an UTC broken-down representation. - (icaltime_as_timet): Add the offset only if the time was supposed - to be in UTC; that way mktime() will get a proper localtime as - source data. - -2000-12-13 Federico Mena Quintero - - * src/libical/icaltime.c (icaltime_from_timet): time_t values - *are* in UTC by definition, so the is_utc argument is useless. - Removed the conversion to UTC and made the icaltimetype.is_utc be - TRUE always. This breaks libical's owne internal use of this - function, but since we do not use any of the functions that use it - that way, we can ignore this. This is basically a temporary - measure until libical does the right thing. - -2000-12-12 Eric Busboom - - * icalparser.c Addedd support for x-parameters. - - * icalenum.c Fixed icalenum_parameter_type_to_string and - icalenum_property_type_to_string to property identify X- parameers - and properties. - - * icalparameter.c Fixed icalparameter_as_ical_string to property - write out X-Parameters. - - -2000-12-13 Christopher James Lahey - - * src/libical/icalerror.h: Added a name to the parameter to - icalerror_set_errno. - -2000-12-12 Eric Busboom - - * icalparser.c Addedd support for x-parameters. - - * icalenum.c Fixed icalenum_parameter_type_to_string and - icalenum_property_type_to_string to property identify X- parameers - and properties. - - * icalparameter.c Fixed icalparameter_as_ical_string to property - write out X-Parameters. - - -2000-12-11 Eric Busboom - - * icalcstp.c added empty bodies to prep_* routines so that shared - libraries would build. - -2000-12-13 Federico Mena Quintero - - * src/libical/Makefile.am (COMBINEDHEADERS): Removed the explicit - paths. Why it did *not* work on my original try when they were - not there, well, now I don't know. - 2000-12-13 Ettore Perazzoli * src/libicalvcal/Makefile.am (INCLUDES): Add @@ -953,9 +522,6 @@ (icalvalue.h): Likewise. (icalvalue.c): Likewise. (icalrestriction.c): Likewise. - (CLEANFILES): Add `icalparameter.h', `icalparameter.c', - `icalproperty.h', `icalproperty.c', `icalrestriction.c', - `icalvalue.h', `icalvalue.c'. (COMBINEDHEADERS): `icalvalue.h', `icalparameter.h' and `icalproperty.h' are in builddir, not srcdir, so fix the list to use `$(top_builddir)' instead of `$(top_srcdir)'. @@ -963,45 +529,23 @@ (BUILT_SOURCES): Move `ical.h' here instead. (ical.h): Don't depend on `(BUILT_SOURCES)'; this a built source itself. + +2000-12-12 Eric Busboom -2000-12-12 Joe Shaw - - * src/libical/icalrecur.c: #if 0ed out some #if 1ed test code that - was breaking my build by #including ical.h. No cookie! - -2000-12-12 Dan Winship - - * configure.in: Add a check for "extern int timezone;" vs struct - tm tm_gmtoff, stolen from Evolution's configure.in. - - * src/libical/icaltime.c (icaltime_utc_offset, - icaltime_local_utc_offset): Use HAVE_TIMEZONE, add tm_gmtoff - support. - - * src/libical/icallexer.l: Remove ical_yy_scan_buffer, ..._string, - and ..._bytes prototypes, since it compiles fine without them on - Linux, and bombs out due to prototype mismatch on my NetBSD box. - -2000-12-11 Federico Mena Quintero - - * Makefile.am: - * configure.in: Disable compilation of the examples directory - until libicalss is fixed. - - * configure.in: Make AC_INIT() check for a file that is not - autogenerated! + * icalparser.c Addedd support for x-parameters. - * configure.in: Added check for Perl. + * icalenum.c Fixed icalenum_parameter_type_to_string and + icalenum_property_type_to_string to property identify X- parameers + and properties. -2000-12-11 Federico Mena Quintero + * icalparameter.c Fixed icalparameter_as_ical_string to property + write out X-Parameters. - * configure.in (AC_OUTPUT): Fixed order of generated files to make - "make distcheck" work. Turn on AM_MAINTAINER_MODE. + +2000-12-11 Eric Busboom - * src/libical/Makefile.am (EXTRA_DIST): Add icalversion.h.in. - (COMBINEDHEADERS): Added paths to make "make distcheck" work. - (libical_la_SOURCES): Added headers for distribution in our weird - setup. + * icalcstp.c added empty bodies to prep_* routines so that shared + libraries would build. 2000-12-11 JP Rosevear @@ -1017,10 +561,20 @@ * src/libical/icalrecur.c: Likewise. - * src/libical/icalvalue.c.in: Likewise. + * src/libical/icalvalue.c: Likewise. * src/libical/icalyacc.y: Likewise. +2000-12-11 Federico Mena Quintero + + * configure.in (AC_OUTPUT): Fixed order of generated files to make + "make distcheck" work. Turn on AM_MAINTAINER_MODE. + + * src/libical/Makefile.am (EXTRA_DIST): Add icalversion.h.in. + (COMBINEDHEADERS): Added paths to make "make distcheck" work. + (libical_la_SOURCES): Added headers for distribution in our weird + setup. + 2000-12-06 Eric Busboom * icaltime.c added icaltime_as_local to convert a UTC time to a @@ -1053,7 +607,7 @@ 2000-11-20 Eric Busboom - * icalmessage.c Many routines to create new ical messages. + * icalmessage.c Many routines to create new ical messages. * icalspanlist.c Code to generate a list of the busy time f the VEVENTS in a set. Also includes routiens to generate free and busy @@ -1066,7 +620,7 @@ * icalrestriction.c Added more restrictions. Now handles mutual and exclusive consitions, and checks for the reight values in STATUS properties - + 2000-11-10 Eric Busboom @@ -1092,18 +646,13 @@ get the next avaliable busy or free time after a given time. 2000-11-06 Federico Mena Quintero - + * src/libical/icalvalue.c (icalvalue_recur_as_ical_string): Handle - both the position and weekday in the by_day field. - -2000-10-20 Jesse Pavel - - * src/libical/icalproperty.c: added support for the - icalproperty_remove_parameter() function. + both the position and weekday in the by_day field. 2000-10-20 Eric Busboom - * Const correctness. Added 'const' all over everywhere. + * Const correctness. Added 'const' all over everywhere. 2000-10-19 Eric Busboom @@ -1113,9 +662,9 @@ * icalclassify.h Added multiple include protection * icalset.h and others, got rid of parameter named "new" - + 2000-10-15 Eric Busboom - + * icalcomponent Added convienience functions for constructing components: icalcomponent_new_vcalendar(), etc. @@ -1128,7 +677,7 @@ * libical. Changed flex/bison to use the -P/-p options to set ical_yy as a prefix. Removed prefix redefinition from icalyacc.y - + 2000-10-12 Eric Busboom * icalproperty.c Fixed icalproperty_get_{first,next}_parameter to @@ -1137,88 +686,22 @@ * icalparameter.c Added, but did not complete, a new version of icalparameters_from_string that does not use the hairy nested case/switch statements of the previous version - -2000-10-11 Damon Chaplin - - * src/libical/icalparameter.c (icalparameter_as_ical_string): - (icalparameter_new_from_string): - * src/libical/icalparser.c (icalparser_add_line): add support for - 'X-' parameters. - -2000-10-07 Dan Winship - - * src/libical/icalyacc.y (weekday_list): Fix the semicolons in - this rule. Noticed by x-virge. - - * src/test/Makefile.in: While I'm here, remove this from CVS, as - it's a generated file. - + + 2000-10-02 Eric Busboom * ical.h ical.h and icalss.h now are concatenations of all of the public headers for their respective libraries. Thus, only ical.h, icalss.h and icalvcal.h need to be installed. -2000-09-12 Ettore Perazzoli - - * configure.in: AC_OUTPUT the Makefile in `src' before the stuff - in its subdirs. - -2000-09-12 JP Rosevear - - * test-data/stresstest.ics: Merge missing file for distcheck - - * src/libicalss/icalcstp.h: ditto - - * src/libicalss/icalcsdb.h: ditto - 2000-09-11 Eric Busboom - * icalvcal.c Added more comments - -2000-09-01 JP Rosevear - - * configure.in: We don't need AC_PROG_RANLIB and - AM_PROG_LIBTOOL - - * src/libical/icalyacc.y (clear_recur): Explicitly - set the week_start to the Monday default in case the - recurrence rule does not. - -2000-08-31 JP Rosevear - - * Kill off more old, dead files - -2000-08-31 JP Rosevear - - * MacOS: This dir is not in 0.19 - -2000-08-31 JP Rosevear - - * src/libical/CHANGES: This file is not in 0.19 - -2000-08-31 JP Rosevear - - * src/libical/.gdb_history: Kill file - - * src/libical/.gdb_history: Kill file - -2000-08-31 JP Rosevear - - * src/pvl/Makefile: Kill old file - - * src/test/usecases.c: Kill old file - - * src/test/.cvsignore: Update - - * src/libicalvcal/.cvsignore: Update - - * examples/.cvsignore: Shut up - + * icalvcal.c Added more comments + 2000-08-31 JP Rosevear * configure.in: Don't list config.h in AC_OUTPUT - + 2000-08-26 Ettore Perazzoli * examples/Makefile.am (INCLUDES): More `$(srcdir)' loving. @@ -1243,14 +726,10 @@ use icalerror_check_arg_re so we can return an valid icalcompiter. (icalcomponent_begin_component): Same. -2000-08-24 JP Rosevear - - * src/libical/icalvcal.h: Remove this duplicate file to fix build - 2000-08-24 Federico Mena Quintero * src/test/Makefile.am: Make it work. - + 2000-08-04 Eric Busboom * stow.c Changed stow to write data to a file ( icalfileset) not a @@ -1262,7 +741,7 @@ * icalmime.h New file that parses mime data and returns an icalcomponent that includes all of the parts. - + 2000-07-26 Eric Busboom * icaldirset.h misc bug fixes to get deleting components to work @@ -1286,7 +765,7 @@ * icalstore.{c,h} CHanged name to icaldirset * icalcluster.{c,h} Changed name to icalfileset - + 2000-06-12 Eric Busboom @@ -1298,13 +777,6 @@ * icalyacc.y Added support for integers in by day lists -2000-06-08 Ettore Perazzoli - - * src/test/Makefile.am (INCLUDES): Likewise. - - * src/libicalss/Makefile.am (INCLUDES): Use $(srcdir) to allow - builddir != srcdir. - 2000-06-01 Eric Busboom * icalrecur.c moved recur code into new files @@ -1315,11 +787,11 @@ * icaltypes.h Changed signature icaltimetype_from_timet to include is_utc flag. - + 2000-03-17 Eric Busboom - * icalstore.c Vastly improved icalstore_test. + * icalstore.c Vastly improved icalstore_test. 2000-03-16 Eric Busboom @@ -1335,5 +807,5 @@ oriented parsing. * icalparser.c Fixed icalparser_get_line to remove \r in input. - + diff --git a/libical/Makefile.am b/libical/Makefile.am index 2220da18ec..220d9f3322 100644 --- a/libical/Makefile.am +++ b/libical/Makefile.am @@ -5,8 +5,5 @@ EXTRA_DIST = \ TEST \ TODO -SUBDIRS = design-data doc scripts test-data src zoneinfo - -# Disabled examples until it builds -#SUBDIRS = design-data doc scripts test-data src examples +SUBDIRS = design-data doc scripts test-data src examples zoneinfo diff --git a/libical/NEWS b/libical/NEWS index 16a7924645..ad1299b2fa 100644 --- a/libical/NEWS +++ b/libical/NEWS @@ -1,3 +1,78 @@ +Version 0.24, XX Xxx 2002 ( cvs tag libical-0-24 ) +-------------------------------------------------- + +**** Incompatibilities with previous version **** + +CSTP client/server code has been removed from libicalss. +Future versions will eventually contain a full CAP 6.0 +client/server implementation. + +icalproperty_get_name() is deprecated and will change +in a future release. Use icalproperty_get_icalproperty_name() +instead. + +icalcomponent_get_span() is deprecated in this release +because it does not handle recurring events. See +icalcomponent_foreach_recurrence() for an alternate +interface. + +The icalproperty_remove_parameter() call is deprecated +because it improperly deals with extended parameters. +See icalproperty_remove_parameter_by_kind() for a +compatible call. + +Code that deals with the TRANSPARENT property now +uses enumeration values to get/set values instead of +strings. + +The code for dealing with icalsets was overhauled. You +will want to use the common icalset_* routines +directly instead of calling into the icalfileset_* or +icaldirset_* routines. + +A number of routines now expect to be called with +const arguments. A number of routines now +return pointers to const data. + + +**** New Features **** + +Major cleanup of the time-handling routines. New API is +available that deals with timezones much more cleanly. + +The regression routines in src/test are much cleaner. +Test runs summarize which tests fail and do not +immediately abort() like the old set of tests. A +number of old, commented tests were resurrected. + +C++ Interface: New libraries libical_cxx.la and libicalss_cxx.la +are build when you configure with the --enable-cxx option. + +Java Interface: A JNI interface to libical is build when +you configure with the --enable-java option. + +Most of libical is now reentrant and thread safe. The Lex/Yacc +query parser is pre-built with flex 2.5.8 and bison 1.34. To +rebuild these files you will need to specify the --with-devel +option. The --enable-reentrant option also adds the -D_REENTRANT +flag for systems that require it. The build system attempts to +add the pthread libraries to support a thread safe memory allocator +and thread-safe error handling. + +A new storage mechanism for Berkeley DB 4.0 was contributed +by Critical Path. Specify the --with-bdb4 and --with-bdb4-dir +options to enable. + +Embedded code comments are slowly being migrated to be +doxygen compliant. See http://www.doxygen.org/ for +more on this wonderful tool. + +The code should now compile with non-gcc compilers. Certain +parts of the autogenerated code were causing problems. The +code base has also been ported to the windows Visual C +environment. + + Version 0.23, 26 Mar 01 ( cvs tag libical-0-23 ) ------------------------------------------------ diff --git a/libical/README b/libical/README index 92b2ff6e86..19a4740e94 100644 --- a/libical/README +++ b/libical/README @@ -13,15 +13,15 @@ improvements made by programmers in both realms. I will only accept changes into my version of the library if they are similarly dual-licensed. -The code in this distribution implements the iCal protocols as -described in RFC2445 and RFC2446. The code is in very early stages of -development. - Portions of this distribution are (C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International Business Machines Corporation and Siemens Rolm Communications Inc. See src/libicalvcal/README.TXT for details. +Portions of this distribution are Copyright (c) 1997 Theo de +Raadt. See the header for src/libical/vsnprintf.c for the full +copyright statement. + This code is under active development. If you would like to contribute to the project, you can contact me, Eric Busboom, at eric@softwarestudio.org. The project has a webpage at @@ -44,11 +44,14 @@ compiles on SunOS 5.6 and FreeBSD 2.27. I have reports of success of previous version on MacOS ( with CodeWarrior ) and on UnixWare, but I don't know about any other systems. -The library is configured with automake. From the root directory, run +The library is configured with automake. IF YOU ARE BUILDING THE +SOURCE FROM A TARBALL, From the root directory, run ./configure -To build all of the Makefiles for your system. If you will be installing the library, you may want to use the --prefix flag to set the directory where the library and header files will be installed. +To build all of the Makefiles for your system. If you will be +installing the library, you may want to use the --prefix flag to set +the directory where the library and header files will be installed. ./configure --prefix=/proj/local/ @@ -61,6 +64,11 @@ libraries use: ./configure --enable-shared + +IF YOU ARE BUILDING FROM CVS, there will be no configure file until +you create one with autogen.sh. YOu can pass configure parameters to +autogen.sh on the command line. + The current version of libical focuses on creating and manipulating iCal objects. With it, you can parse text representations of iCal components, add and remove sub-components, properties, @@ -86,14 +94,8 @@ Using the Library ----------------- There is rudimentary, unfinished documentation in the /doc directory, -and annotated examples in /examples. - - -Perl Library ------------- +and annotated examples in /examples and the test code in src/test. -There is a perl language binding of this library, LIBICAL. -It is available from http://www.softwarestudio.org/libical Eric Busboom diff --git a/libical/THANKS b/libical/THANKS index a56bca9365..d795eecaa3 100644 --- a/libical/THANKS +++ b/libical/THANKS @@ -40,7 +40,7 @@ Tom Leitner For several bug fixes in compiling on Tru64 UNIX. Patrick Lewis for several bug reports and -contributions to the Python bindings +substantial ( co-authorship) contributions to the Python bindings Larry W. Virden for several bug reports in compiling on Solaris. @@ -52,3 +52,18 @@ Hubert V for checking and analyzing the output of the recurrence rule system. Jonathan Yue for icalproperty_get_name() + +Jeff Mace for finding bugs in gauges. + +John Gray for routing memory leaks, porting to +WIN32, and taking over leadership of the project. + +Andrea Campi for miscellaneous updates and beginning +of Doxygen documentation. + +Paul Lindner for several contributions, including +C++ binding, reentrant parser, thread safe memory allocator, and a +lot of documentation. + +Mark Tearle for keeping the Python bindings up +to date. diff --git a/libical/TODO b/libical/TODO index eb52fb7a25..f707c2a525 100644 --- a/libical/TODO +++ b/libical/TODO @@ -1,6 +1,6 @@ -TODOs for libical-0.16 ---------------------- +TODOs for libical +----------------- libical treats properties with multiple values incorrecty -- it always seperates multiple values into multiple properties. This is not diff --git a/libical/autogen.sh b/libical/autogen.sh index e15e4e33a8..ef41bbe86e 100755 --- a/libical/autogen.sh +++ b/libical/autogen.sh @@ -46,25 +46,6 @@ case $CC in *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;; esac -if test -z "$ACLOCAL_FLAGS"; then - - acdir=`aclocal --print-ac-dir` - m4list="glib.m4" - - for file in $m4list - do - if [ ! -f "$acdir/$file" ]; then - echo "WARNING: aclocal's directory is $acdir, but..." - echo " no file $acdir/$file" - echo " You may see fatal macro warnings below." - echo " If these files are installed in /some/dir, set the ACLOCAL_FLAGS " - echo " environment variable to \"-I /some/dir\", or install" - echo " $acdir/$file." - echo "" - fi - done -fi - aclocal $ACLOCAL_FLAGS # optionally feature autoheader diff --git a/libical/configure.in b/libical/configure.in index df2850e84d..c148ca0d6c 100644 --- a/libical/configure.in +++ b/libical/configure.in @@ -1,18 +1,9 @@ dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.52) - AC_INIT(src) -AM_INIT_AUTOMAKE(libical-evolution,0.23a) -AM_CONFIG_HEADER(config.h) - -dnl Set the aux dir to .. (the toplevel evolution directory) so ylwrap -dnl is found in the correct directory for automake >= 1.5 -AC_CONFIG_AUX_DIR(..) +AC_CANONICAL_SYSTEM -dnl subst in evolution's private directories -AC_SUBST(privlibdir) -AC_SUBST(privincludedir) -AC_SUBST(privdatadir) +AM_INIT_AUTOMAKE(libical,0.24) +AM_CONFIG_HEADER(config.h) dnl Initialize maintainer mode AM_MAINTAINER_MODE @@ -20,6 +11,7 @@ AM_MAINTAINER_MODE dnl Checks for programs. AC_PROG_YACC AC_PROG_CC +AC_PROG_CXX AM_PROG_LEX AC_PROG_LN_S AC_PROG_INSTALL @@ -29,11 +21,143 @@ AM_PROG_LIBTOOL AC_SUBST(AR) +dnl *** bdb4 support + +AC_MSG_CHECKING(for Berkeley DB4 support) +AC_ARG_WITH(bdb4, [ --with-bdb4 Add support for Berkeley DB 4.0], +[case $with_bdb4 in + yes) AC_MSG_RESULT(yes) + AC_MSG_RESULT( Adding Berkeley DB support) + WITH_BDB4="yes" + ;; + no) AC_MSG_RESULT(no) + ;; + *) AC_MSG_RESULT(no) + AC_MSG_RESULT(Ignoring unknown argument to --with-bdb4: $with_bdb4) + ;; +esac], +AC_MSG_RESULT(no)) + +if test x$WITH_BDB4 = xyes; then + AC_ARG_WITH(bdb4_dir, [ --with-bdb4-dir=PATH Use PATH as location of BerkeleyDB 4.0], + BDB_DIR=$withval, + BDB_DIR=/usr/local/BerkeleyDB.4.0 + ) + + AC_MSG_CHECKING(for Berkeley DB include files) + if test -f $BDB_DIR/include/db.h; then + BDB_DIR_INCLUDE=$BDB_DIR/include + AC_MSG_RESULT($BDB_DIR_INCLUDE) + else + if test -f $BDB_DIR/include/db4/db.h; then + BDB_DIR_INCLUDE=$BDB_DIR/include/db4 + AC_MSG_RESULT($BDB_DIR_INCLUDE) + else + WITH_BDB4="no" + AC_MSG_RESULT(not found!) + fi + fi + + AC_MSG_CHECKING(for Berkeley DB libraries) + if test -f $BDB_DIR/lib/libdb-4.0.la; then + BDB_DIR_LIB=$BDB_DIR/lib + BDB_LIB=libdb-4.0.la + AC_MSG_RESULT($BDB_DIR_LIB $BDB_LIB) + else + if test -f $BDB_DIR/lib/libdb4.la; then + BDB_DIR_LIB=$BDB_DIR/lib + BDB_LIB=libdb4.la + AC_MSG_RESULT($BDB_DIR_LIB $BDB_LIB) + else + WITH_BDB4="no" + AC_MSG_RESULT(not found!) + fi + fi + + AC_SUBST(BDB_DIR) + AC_SUBST(BDB_DIR_INCLUDE) + AC_SUBST(BDB_DIR_LIB) + AC_SUBST(BDB_LIB) + dnl 4.0 is required... + BDB_VERSION="4.0" + AC_SUBST(BDB_VERSION) +fi +AM_CONDITIONAL(WITH_BDB4, test x$WITH_BDB4 = xyes) + +dnl *** Yacc/Bison support + +AC_MSG_CHECKING(whether to support development) +AC_ARG_WITH(devel, [ --with-devel Add development options], +[case $with_devel in + yes) DEV="yes" + AC_MSG_RESULT(yes) + AC_MSG_RESULT(Setting up for development: -Wall, flex, bison) + AC_MSG_RESULT(** Note that you will need flex 2.5.7 or higher) + ;; + no) AC_MSG_RESULT(no) + ;; + *) AC_MSG_RESULT(no) + AC_MSG_RESULT(Ignoring unknown argument to --with-devel: $with_devel) + ;; +esac], +AC_MSG_RESULT(no)) +AM_CONDITIONAL(DEV, test x$DEV = xyes) + AC_CHECK_PROGS(AR, ar aal, ar) AC_CHECK_PROGS(PERL, perl5 perl) -dnl AC_DEFINE(ICAL_ERRORS_ARE_FATAL,1,[Define to make icalerror_* calls abort instead of internally signalling an error]) -AC_DEFINE(ICAL_SAFESAVES,1,[Define to make icalcluster_commit() save to a temp file and mv to the original file instead of writing to the orig file directly]) +AC_MSG_CHECKING(whether to define _REENTRANT) +AC_ARG_ENABLE(reentrant, [ --enable-reentrant define _REENTRANT to enable reentrant system calls], +[ case "${enableval}" in + no) + AC_MSG_RESULT(no) + ac_cv_reentrant=no + ;; + *) + AC_MSG_RESULT(yes) + AC_DEFINE(ICAL_REENTRANT, ,[Define if we want _REENTRANT]) [CFLAGS="$CFLAGS -D_REENTRANT"] + ac_cv_reentrant=yes + ;; + esac ], + AC_MSG_RESULT(no) +) + +dnl *** libicalcap support (experimental) + +AC_MSG_CHECKING(for CAP/BEEP support) +AC_ARG_WITH(libicalcap, [ --with-libicalcap Add support for CAP/BEEP support], +[case $with_libicalcap in + yes) AC_MSG_RESULT(yes) + AC_MSG_RESULT( Adding CAP/BEEP support) + WITH_CAP="yes" + ;; + no) AC_MSG_RESULT(no) + ;; + *) AC_MSG_RESULT(no) + AC_MSG_RESULT(Ignoring unknown argument to --with-libicalcap: $with_libicalcap) + ;; +esac], +AC_MSG_RESULT(no)) + +if test x$WITH_CAP = xyes; then + AC_MSG_CHECKING(for CAP/BEEP files) + PKG_CHECK_MODULES(RRCAP, roadrunner >= 0.9 \ + rrtls >= 0.9 \ + rrsasl >= 0.9 \ + rrcap >= 0.9) + + AC_SUBST(RRCAP_CFLAGS) + AC_SUBST(RRCAP_LIBS) +fi +AM_CONDITIONAL(WITH_CAP, test x$WITH_CAP = xyes) + +dnl ************************************************** +dnl test/regression.c (and maybe others) needs this defined +dnl ************************************************** +AC_DEFINE(ICAL_ERRORS_ARE_FATAL,1,[Define to make icalerror_* calls abort instead of internally signalling an error]) +AC_DEFINE(NO_WARN_DEPRECATED,1,[Define to 1 if you DO NOT WANT to see deprecated messages]) +AC_DEFINE(NO_WARN_ICAL_MALFORMEDDATA_ERROR_HACK,1,[Define to 1 if you DO NO WANT to see the warning messages related to ICAL_MALFORMEDDATA_ERROR and parsing .ics zoneinfo files]) + AC_DEFINE(ICAL_UNIX_NEWLINE,1,[Define to terminate lines with "\n" instead of "\r\n"]) dnl AC_DEFINE(ICAL_NO_EMPTY_ARRAY_DECL,1,[Define to 1 if your compile does not like lines like: struct something foo[]]) @@ -41,38 +165,103 @@ dnl Checks for libraries. dnl Replace `main' with a function in -lical: dnl AC_CHECK_LIB(ical, main) +dnl Check if this system can use pthreads +dnl HACK to support FreeBSD 4.x pthread + +case "${host}" in + *-*-freebsdelf4* ) + AC_MSG_RESULT(checking for pthread_create in -lpthread... -pthread (FreeBSD 4.x style)) + AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.]) + PTHREAD_LIBS=-pthread;; + + *) + AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes) + if test "x$have_pthread" = xyes; then + AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.]) + PTHREAD_LIBS=-lpthread + fi;; +esac + +AM_CONDITIONAL(HAVE_PTHREAD, test "$have_pthread" = "yes") +AC_SUBST(PTHREAD_LIBS) + dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(time.h sys/types.h assert.h) +AC_CHECK_HEADERS(assert.h ctype.h pthread.h stdint.h time.h sys/types.h unistd.h wctype.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_SIZE_T +AC_TYPE_MODE_T +AC_CHECK_TYPE(intptr_t) AC_STRUCT_TM dnl Checks for library functions. -AC_CHECK_FUNCS(strdup) +AC_CHECK_FUNCS(gmtime_r isspace iswspace strdup snprintf) + +dnl ************************************************** +dnl * Check for C++ +dnl ************************************************** + +AC_ARG_ENABLE(cxx, +[ --enable-cxx Enable C++ bindings],,enable_cxx="no") +AM_CONDITIONAL(WITH_CXX, test x$enable_cxx = "xyes") + +dnl ************************************************** +dnl * Check for Java +dnl ************************************************** + +AC_ARG_ENABLE(java, +[ --enable-java Enable Java bindings],,enable_java="no") +if test "x$enable_java" = "xyes"; then + AC_PATH_PROG(JAR, jar, /usr/local/bin/jar, /usr/local/bin:$PATH) + AC_PATH_PROG(JAVA, java, /usr/local/bin/java, /usr/local/bin:$PATH) + AC_PATH_PROG(JAVAC, javac, /usr/local/bin/javac, /usr/local/bin:$PATH) + AC_PATH_PROG(JAVAH, javah, /usr/local/bin/javah, /usr/local/bin:$PATH) + AC_SUBST(JAR) + AC_SUBST(JAVA) + AC_SUBST(JAVAC) + AC_SUBST(JAVAH) + + dnl truly gross + + case "${host}" in + *-*-solaris*) JAVA_PLATFORM="solaris" ;; + *-*-linux*) JAVA_PLATFORM="linux" ;; + *-*-freebsd*) JAVA_PLATFORM="bsd" ;; + *-*-aix*) JAVA_PLATFORM="aix" ;; + *-sequent-*) JAVA_PLATFORM="ptx" ;; + *-*-hpux*) JAVA_PLATFORM="hpux" ;; + *-*-irix*) JAVA_PLATFORM="irix" ;; + *-*-os390*) JAVA_PLATFORM="os390" ;; + *-*-os400*) JAVA_PLATFORM="os400" ;; + *-apple-darwin*|*-apple-rhapsody*) JAVA_PLATFORM="darwin" ;; + *) JAVA_PLATFORM="unknown" ;; + esac + + AC_SUBST(JAVA_PLATFORM) +fi + +AM_CONDITIONAL(WITH_JAVA, test x$enable_java = "xyes") dnl ************************************************** dnl * Check for Python dnl ************************************************** python_val=false -AC_ARG_ENABLE(python-bindings, -[ --enable-python-bindings=[yes/no] Enable python bindings],,enable_python_bindings=no) -if test "x$enable_python_bindings" = "xyes"; then +AC_ARG_ENABLE(python, +[ --enable-python Enable python bindings],,enable_python="no") + +if test "x$enable_python" = "xyes"; then python_val=true else python_val=false fi -if $python_val; then +if test $python_val = true; then + AC_CHECK_PROG(python_val, python, true, false) -fi -if $python_val; then AC_CHECK_PROG(python_val, swig, true, false) -fi -if $python_val; then PY_PREFIX=`python -c 'import sys ; print sys.prefix'` PY_EXEC_PREFIX=`python -c 'import sys ; print sys.exec_prefix'` changequote(<<, >>)dnl @@ -95,17 +284,23 @@ if $python_val; then python_val=false fi fi -AM_CONDITIONAL(WITH_PYTHON, $python_val) +AM_CONDITIONAL(WITH_PYTHON, test $python_val = true) AC_OUTPUT([ Makefile design-data/Makefile doc/Makefile +examples/Makefile scripts/Makefile src/Makefile src/libical/Makefile src/libical/icalversion.h +src/libicalcap/Makefile +src/libicalss/Makefile src/libicalvcal/Makefile +src/python/Makefile +src/java/Makefile +src/test/Makefile test-data/Makefile zoneinfo/Makefile ]) diff --git a/libical/design-data/.cvsignore b/libical/design-data/.cvsignore index 3dda72986f..bbc8ba00d1 100644 --- a/libical/design-data/.cvsignore +++ b/libical/design-data/.cvsignore @@ -1,2 +1,5 @@ -Makefile.in Makefile +.deps +.libs +*.lo +*.la diff --git a/libical/design-data/components.txt b/libical/design-data/components.txt index ae5cc976ad..c4736e72b2 100644 --- a/libical/design-data/components.txt +++ b/libical/design-data/components.txt @@ -1,22 +1,22 @@ +ANY +VAGENDA +VALARM VCALENDAR +VCAR +VCOMMAND VEVENT -VTODO -VJOURNAL VFREEBUSY +VJOURNAL +VQUERY +VSCHEDULE VTIMEZONE -XSTANDARDTIME -XDAYLIGHTSAVINGSTIME -VALARM +VTODO +X XAUDIOALARM +XDAYLIGHTSAVINGSTIME XDISPLAYALARM XEMAILALARM -XPROCEDUREALARM -X -VSCHEDULE -VQUERY -VCAR -VCOMMAND XLICINVALID XMIMEPART -ANY - +XPROCEDUREALARM +XSTANDARDTIME diff --git a/libical/design-data/parameters.csv b/libical/design-data/parameters.csv index f223b415a8..d0a2ef9df6 100644 --- a/libical/design-data/parameters.csv +++ b/libical/design-data/parameters.csv @@ -12,13 +12,22 @@ "MEMBER","const char*", "PARTSTAT","icalparameter_partstat","NEEDS-ACTION;ACCEPTED;DECLINED;TENTATIVE;DELEGATED;COMPLETED;INPROCESS" "RANGE","icalparameter_range","THISANDPRIOR;THISANDFUTURE" -"RELATED","icalparameter_related","START;END " +"RELATED","icalparameter_related","START;END" "RELTYPE","icalparameter_reltype","PARENT;CHILD;SIBLING" "ROLE","icalparameter_role","CHAIR;REQ-PARTICIPANT;OPT-PARTICIPANT;NON-PARTICIPANT" "RSVP","icalparameter_rsvp","TRUE;FALSE" "SENT-BY","const char*", "TZID","const char*", -"VALUE","icalparameter_value","BINARY;BOOLEAN;DATE;DURATION;FLOAT;INTEGER;PERIOD;RECUR;TEXT;TIME;URI;ERROR;DATE-TIME;UTC-OFFSET;CAL-ADDRESS" +"VALUE","icalparameter_value","BINARY;BOOLEAN;DATE;DURATION;FLOAT;INTEGER;PERIOD;RECUR;TEXT;URI;ERROR;DATE-TIME;UTC-OFFSET;CAL-ADDRESS" "X","const char*", "X-LIC-ERRORTYPE","icalparameter_xlicerrortype","COMPONENT-PARSE-ERROR;PROPERTY-PARSE-ERROR;PARAMETER-NAME-PARSE-ERROR;PARAMETER-VALUE-PARSE-ERROR;VALUE-PARSE-ERROR;INVALID-ITIP;UNKNOWN-VCAL-PROP-ERROR;MIME-PARSE-ERROR;VCAL-PROP-PARSE-ERROR" -"X-LIC-COMPARETYPE","icalparameter_xliccomparetype","EQUAL;NOTEQUAL;LESS;GREATER;LESSEQUAL;GREATEREQUAL;REGEX" +"X-LIC-COMPARETYPE","icalparameter_xliccomparetype","EQUAL;NOTEQUAL;LESS;GREATER;LESSEQUAL;GREATEREQUAL;REGEX;ISNULL;ISNOTNULL" +"#CAP Parameters","Draft 8", +"#this parameter should really be called ACTION, but this conflicts with the ACTION property" +"ACTIONPARAM","icalparameter_action","ASK;ABORT" +"ID","const char*", +"ENABLE","icalparameter_enable","TRUE;FALSE" +"LATENCY","const char*", +"LOCAL","icalparameter_local","TRUE;FALSE" +"LOCALIZE","const char*", +"OPTIONS","const char*", diff --git a/libical/design-data/params-in-prop.txt b/libical/design-data/params-in-prop.txt index 4d4e133fc3..863366312e 100644 --- a/libical/design-data/params-in-prop.txt +++ b/libical/design-data/params-in-prop.txt @@ -4,6 +4,7 @@ ATTENDEE CN CUTYPE DELEGATED-FROM DELEGATED-TO DIR LANGUAGE MEMBER P CALSCALE X CATEGORIES LANGUAGE X CLASS X +CMD ACTIONPARAM ID LATENCY LOCALIZE OPTIONS X COMMENT ALTREP LANGUAGE X COMPLETED X CONTACT ALTREP LANGUAGE X @@ -32,11 +33,11 @@ REPEAT X REQUEST-STATUS LANGUAGE X RESOURCES ALTREP LANGUAGE X RRULE X -SEQUENCE X +SEQUENCE LOCAL X STATUS X SUMMARY ALTREP LANGUAGE X TRANSP X -TRIGGER VALUE RELATED X +TRIGGER ENABLE VALUE RELATED X TZID X TZNAME LANGUAGE X TZOFFSETFROM X @@ -52,4 +53,5 @@ MAXRESULTS X MAXRESULTSSIZE X QUERY X QUERYNAME X -TARGET X \ No newline at end of file +TARGET X +EXPAND X diff --git a/libical/design-data/properties.csv b/libical/design-data/properties.csv index dca6810d8f..11f977ed3d 100644 --- a/libical/design-data/properties.csv +++ b/libical/design-data/properties.csv @@ -5,7 +5,7 @@ "ATTENDEE","CAL-ADDRESS","CAL-ADDRESS" "CALSCALE","TEXT","TEXT" "CATEGORIES","TEXT","TEXT" -"CLASS","TEXT","TEXT" +"CLASS","CLASS","CLASS" "COMMENT","TEXT","TEXT" "COMPLETED","DATE-TIME","DATE-TIME" "CONTACT","TEXT","TEXT" @@ -31,13 +31,13 @@ "RECURRENCE-ID","DATE-TIME","DATE-TIME" "RELATED-TO","TEXT","TEXT" "REPEAT","INTEGER","INTEGER" -"REQUEST-STATUS","STRING","STRING" +"REQUEST-STATUS","REQUEST-STATUS","REQUEST-STATUS" "RESOURCES","TEXT","TEXT" "RRULE","RECUR","RECUR" "SEQUENCE","INTEGER","INTEGER" "STATUS","STATUS","STATUS" "SUMMARY","TEXT","TEXT" -"TRANSP","TEXT","TEXT" +"TRANSP","TRANSP","TRANSP" "TRIGGER","TRIGGER","DURATION" "TZID","TEXT","TEXT" "TZNAME","TEXT","TEXT" @@ -47,13 +47,10 @@ "UID","TEXT","TEXT" "URL","URI","URI" "VERSION","TEXT","TEXT" -"X","TEXT","TEXT" -"SCOPE","TEXT","TEXT" +"X","X","X" "MAXRESULTS","INTEGER","INTEGER" "MAXRESULTSSIZE","INTEGER","INTEGER" -"QUERY","QUERY","QUERY" "QUERYNAME","TEXT","TEXT" -"TARGET","CAL-ADDRESS","CAL-ADDRESS" "X-LIC-ERROR","TEXT","TEXT" "X-LIC-CLUSTERCOUNT","STRING","STRING" "X-LIC-MIMECONTENTTYPE","STRING","STRING" @@ -62,5 +59,50 @@ "X-LIC-MIMEOPTINFO","STRING","STRING" "X-LIC-MIMECID","STRING","STRING" "X-LIC-MIMEFILENAME","STRING","STRING" +"X-LIC-CLASS","X-LIC-CLASS","X-LIC-CLASS" "ANY","NO","NO" "NO","NO","NO" +"#CAP Properties",, +,"FIXME","Should be BOOLEAN" +"ALLOW-CONFLICT","TEXT","TEXT" +"CALID","TEXT","TEXT" +"CALMASTER","TEXT","TEXT" +"CARID","TEXT","TEXT" +"CMD","CMD","CMD" +"CSID","URI","URI" +"DECREED","TEXT","TEXT" +"DEFAULT-CHARSET","TEXT","TEXT" +"DEFAULT-LOCALE","TEXT","TEXT" +"DEFAULT-TZID","TEXT","TEXT" +"DEFAULT-VCARS","TEXT","TEXT" +,"FIXME","Should be UPN-FILTER" +"DENY","TEXT","TEXT" +,"FIXME","Should be BOOLEAN" +"EXPAND","INTEGER","INTEGER" +,"FIXME","Should be UPN-FILTER" +"GRANT","TEXT","TEXT" +"MAXDATE","DATE-TIME","DATE-TIME" +"MINDATE","DATE-TIME","DATE-TIME" +"NAME","TEXT","TEXT" +"OWNER","TEXT","TEXT" +"PERMISSION","TEXT","TEXT" +"QUERY","QUERY","QUERY" +"QUERYID","TEXT","TEXT" +"RELCALID","TEXT","TEXT" +"RESTRICTION","QUERY","QUERY" +"SCOPE","TEXT","TEXT" +"TARGET","CAL-ADDRESS","CAL-ADDRESS" +"#CAP Properties","These are only allowed in VREPLY", +"CAP-VERSION","TEXT","TEXT" +"CAR-LEVEL","CAR-LEVEL","CAR-LEVEL" +"COMPONENTS","TEXT","TEXT" +"STORES-EXPANDED","TEXT","TEXT" +"DATE-MAX","DATE-TIME","DATE-TIME" +"DATE-MIN","DATE-TIME","DATE-TIME" +"ITIP-VERSION","TEXT","TEXT" +"MAX-COMPONENT-SIZE","INTEGER","INTEGER" +"MULTIPART","TEXT","TEXT" +"QUERY-LEVEL","QUERY-LEVEL","QUERY-LEVEL" +"RECUR-ACCEPTED","TEXT","TEXT" +"RECUR-EXPAND","TEXT","TEXT" +"RECUR-LIMIT","TEXT","TEXT" diff --git a/libical/design-data/restrictions.csv b/libical/design-data/restrictions.csv index 1c62e2a8b4..bded850694 100644 --- a/libical/design-data/restrictions.csv +++ b/libical/design-data/restrictions.csv @@ -14,8 +14,8 @@ PUBLISH,VEVENT,COMMENT,NONE,ZEROORONE PUBLISH,VEVENT,CONTACT,NONE,ZEROPLUS PUBLISH,VEVENT,CREATED,NONE,ZEROORONE PUBLISH,VEVENT,DESCRIPTION,NONE,ZEROORONE -PUBLISH,VEVENT,DTEND,NONE,ZEROORONE -PUBLISH,VEVENT,DURATION,NONE,ZEROORONE +PUBLISH,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration +PUBLISH,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_dtend PUBLISH,VEVENT,EXDATE,NONE,ZEROPLUS PUBLISH,VEVENT,EXRULE,NONE,ZEROPLUS PUBLISH,VEVENT,GEO,NONE,ZEROORONE @@ -38,6 +38,7 @@ PUBLISH,VEVENT,NONE,VJOURNAL,ZERO PUBLISH,VEVENT,NONE,VTODO,ZERO PUBLISH,VEVENT,NONE,VTIMEZONE,ZEROPLUS,must_if_tz_ref PUBLISH,VEVENT,NONE,X,ZEROPLUS +PUBLISH,VEVENT,RELCALID,NONE,ZEROORONE REQUEST,VEVENT,NONE,NONE,ONEPLUS REQUEST,VEVENT,ATTENDEE,NONE,ONEPLUS REQUEST,VEVENT,DTSTAMP,NONE,ONE @@ -77,6 +78,7 @@ REQUEST,VEVENT,NONE,X,ZEROPLUS REQUEST,VEVENT,NONE,VFREEBUSY,ZERO REQUEST,VEVENT,NONE,VJOURNAL,ZERO REQUEST,VEVENT,NONE,VTODO,ZERO +REQUEST,VEVENT,RELCALID,NONE,ZEROORONE REPLY,VEVENT,NONE,NONE,ONEPLUS REPLY,VEVENT,ATTENDEE,NONE,ONE REPLY,VEVENT,DTSTAMP,NONE,ONE @@ -116,6 +118,7 @@ REPLY,VEVENT,NONE,VALARM,ZERO REPLY,VEVENT,NONE,VFREEBUSY,ZERO REPLY,VEVENT,NONE,VJOURNAL,ZERO REPLY,VEVENT,NONE,VTODO,ZERO +REPLY,VEVENT,RELCALID,NONE,ZEROORONE ADD,VEVENT,NONE,NONE,ONE ADD,VEVENT,DTSTAMP,NONE,ONE ADD,VEVENT,DTSTART,NONE,ONE @@ -132,7 +135,7 @@ ADD,VEVENT,CONTACT,NONE,ZEROPLUS ADD,VEVENT,CREATED,NONE,ZEROORONE ADD,VEVENT,DESCRIPTION,NONE,ZEROORONE ADD,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration -ADD,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_duration +ADD,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_dtend ADD,VEVENT,EXDATE,NONE,ZEROPLUS ADD,VEVENT,EXRULE,NONE,ZEROPLUS ADD,VEVENT,GEO,NONE,ZEROORONE @@ -155,6 +158,7 @@ ADD,VEVENT,NONE,X,ZEROPLUS ADD,VEVENT,NONE,VFREEBUSY,ZERO ADD,VEVENT,NONE,VTODO,ZERO ADD,VEVENT,NONE,VJOURNAL,ZERO +ADD,VEVENT,RELCALID,NONE,ZEROORONE CANCEL,VEVENT,NONE,NONE,ONEPLUS CANCEL,VEVENT,ATTENDEE,NONE,ZEROPLUS CANCEL,VEVENT,DTSTAMP,NONE,ONE @@ -170,7 +174,7 @@ CANCEL,VEVENT,CREATED,NONE,ZEROORONE CANCEL,VEVENT,DESCRIPTION,NONE,ZEROORONE CANCEL,VEVENT,DTEND,NONE,ONEEXCLUSIVE ,no_duration CANCEL,VEVENT,DTSTART,NONE,ZEROORONE -CANCEL,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_duration +CANCEL,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_dtend CANCEL,VEVENT,EXDATE,NONE,ZEROPLUS CANCEL,VEVENT,EXRULE,NONE,ZEROPLUS CANCEL,VEVENT,GEO,NONE,ZEROORONE @@ -194,6 +198,7 @@ CANCEL,VEVENT,NONE,VTODO,ZERO CANCEL,VEVENT,NONE,VJOURNAL,ZERO CANCEL,VEVENT,NONE,VFREEBUSY,ZERO CANCEL,VEVENT,NONE,VALARM,ZERO +CANCEL,VEVENT,RELCALID,NONE,ZEROORONE REFRESH,VEVENT,NONE,NONE,ONE REFRESH,VEVENT,ATTENDEE,NONE,ONE REFRESH,VEVENT,DTSTAMP,NONE,ONE @@ -233,6 +238,7 @@ REFRESH,VEVENT,NONE,VJOURNAL,ZERO REFRESH,VEVENT,NONE,VFREEBUSY,ZERO REFRESH,VEVENT,NONE,VTIMEZONE,ZERO,must_if_tz_ref REFRESH,VEVENT,NONE,VALARM,ZERO +REFRESH,VEVENT,RELCALID,NONE,ZEROORONE COUNTER,VEVENT,NONE,NONE,ONE COUNTER,VEVENT,DTSTAMP,NONE,ONE COUNTER,VEVENT,DTSTART,NONE,ONE @@ -249,7 +255,7 @@ COUNTER,VEVENT,CONTACT,NONE,ZEROPLUS COUNTER,VEVENT,CREATED,NONE,ZEROORONE COUNTER,VEVENT,DESCRIPTION,NONE,ZEROORONE COUNTER,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration -COUNTER,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_duration +COUNTER,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_dtend COUNTER,VEVENT,EXDATE,NONE,ZEROPLUS COUNTER,VEVENT,EXRULE,NONE,ZEROPLUS COUNTER,VEVENT,GEO,NONE,ZEROORONE @@ -272,6 +278,7 @@ COUNTER,VEVENT,NONE,X,ZEROPLUS COUNTER,VEVENT,NONE,VTODO,ZERO COUNTER,VEVENT,NONE,VJOURNAL,ZERO COUNTER,VEVENT,NONE,VFREEBUSY,ZERO +COUNTER,VEVENT,RELCALID,NONE,ZEROORONE DECLINECOUNTER,VEVENT,NONE,NONE,ONE DECLINECOUNTER,VEVENT,DTSTAMP,NONE,ONE DECLINECOUNTER,VEVENT,ORGANIZER,NONE,ONE @@ -311,6 +318,7 @@ DECLINECOUNTER,VEVENT,NONE,VJOURNAL,ZERO DECLINECOUNTER,VEVENT,NONE,VFREEBUSY,ZERO DECLINECOUNTER,VEVENT,NONE,VTIMEZONE,ZERO,must_if_tz_ref DECLINECOUNTER,VEVENT,NONE,VALARM,ZERO +DECLINECOUNTER,VEVENT,RELCALID,NONE,ZEROORONE PUBLISH,VFREEBUSY,NONE,NONE,ONEPLUS PUBLISH,VFREEBUSY,DTSTAMP,NONE,ONE PUBLISH,VFREEBUSY,DTSTART,NONE,ONE @@ -411,6 +419,7 @@ PUBLISH,VTODO,NONE,X,ZEROPLUS PUBLISH,VTODO,NONE,VFREEBUSY,ZERO PUBLISH,VTODO,NONE,VEVENT,ZERO PUBLISH,VTODO,NONE,VJOURNAL,ZERO +PUBLISH,VTODO,RELCALID,NONE,ZEROORONE REQUEST,VTODO,NONE,NONE,ONEPLUS REQUEST,VTODO,ATTENDEE,NONE,ONEPLUS REQUEST,VTODO,DTSTAMP,NONE,ONE @@ -450,6 +459,7 @@ REQUEST,VTODO,NONE,X,ZEROPLUS REQUEST,VTODO,NONE,VEVENT,ZERO REQUEST,VTODO,NONE,VFREEBUSY,ZERO REQUEST,VTODO,NONE,VJOURNAL,ZERO +REQUEST,VTODO,RELCALID,NONE,ZEROORONE REPLY,VTODO,NONE,NONE,ONEPLUS REPLY,VTODO,ATTENDEE,NONE,ONEPLUS REPLY,VTODO,DTSTAMP,NONE,ONE @@ -488,6 +498,7 @@ REPLY,VTODO,NONE,X,ZEROPLUS REPLY,VTODO,NONE,VALARM,ZERO REPLY,VTODO,NONE,VEVENT,ZERO REPLY,VTODO,NONE,VFREEBUSY,ZERO +REPLY,VTODO,RELCALID,NONE,ZEROORONE ADD,VTODO,NONE,NONE,ONE ADD,VTODO,DTSTAMP,NONE,ONE ADD,VTODO,ORGANIZER,NONE,ONE @@ -527,6 +538,7 @@ ADD,VTODO,NONE,X,ZEROPLUS ADD,VTODO,NONE,VEVENT,ZERO ADD,VTODO,NONE,VJOURNAL,ZERO ADD,VTODO,NONE,VFREEBUSY,ZERO +ADD,VTODO,RELCALID,NONE,ZEROORONE CANCEL,VTODO,NONE,NONE,ONE CANCEL,VTODO,ATTENDEE,NONE,ZEROPLUS CANCEL,VTODO,UID,NONE,ONE @@ -564,6 +576,7 @@ CANCEL,VTODO,NONE,X,ZEROPLUS CANCEL,VTODO,NONE,VALARM,ZERO CANCEL,VTODO,NONE,VEVENT,ZERO CANCEL,VTODO,NONE,VFREEBUSY,ZERO +CANCEL,VTODO,RELCALID,NONE,ZEROORONE REFRESH,VTODO,NONE,NONE,ONE REFRESH,VTODO,ATTENDEE,NONE,ONE REFRESH,VTODO,DTSTAMP,NONE,ONE @@ -601,6 +614,7 @@ REFRESH,VTODO,NONE,VALARM,ZERO REFRESH,VTODO,NONE,VEVENT,ZERO REFRESH,VTODO,NONE,VFREEBUSY,ZERO REFRESH,VTODO,NONE,VTIMEZONE,ZERO +REFRESH,VTODO,RELCALID,NONE,ZEROORONE COUNTER,VTODO,NONE,NONE,ONE COUNTER,VTODO,ATTENDEE,NONE,ONEPLUS COUNTER,VTODO,DTSTAMP,NONE,ONE @@ -639,6 +653,7 @@ COUNTER,VTODO,NONE,VTIMEZONE,ZEROORONE COUNTER,VTODO,NONE,X,ZEROPLUS COUNTER,VTODO,NONE,VEVENT,ZERO COUNTER,VTODO,NONE,VFREEBUSY,ZERO +COUNTER,VTODO,RELCALID,NONE,ZEROORONE DECLINECOUNTER,VTODO,NONE,NONE,ONE DECLINECOUNTER,VTODO,ATTENDEE,NONE,ONEPLUS DECLINECOUNTER,VTODO,DTSTAMP,NONE,ONE @@ -676,6 +691,7 @@ DECLINECOUNTER,VTODO,NONE,X,ZEROPLUS DECLINECOUNTER,VTODO,NONE,VALARM,ZERO DECLINECOUNTER,VTODO,NONE,VEVENT,ZERO DECLINECOUNTER,VTODO,NONE,VFREEBUSY,ZERO +DECLINECOUNTER,VTODO,RELCALID,NONE,ZEROORONE PUBLISH,VJOURNAL,NONE,NONE,ONEPLUS PUBLISH,VJOURNAL,DESCRIPTION,NONE,ONE PUBLISH,VJOURNAL,DTSTAMP,NONE,ONE @@ -770,9 +786,58 @@ CANCEL,VJOURNAL,NONE,VALARM,ZERO CANCEL,VJOURNAL,NONE,VEVENT,ZERO CANCEL,VJOURNAL,NONE,VFREEBUSY,ZERO CANCEL,VJOURNAL,NONE,VTODO,ZERO +PUBLISH,VAGENDA,NONE,NONE,ONEPLUS +PUBLISH,VAGENDA,CALMASTER,NONE,ONE +PUBLISH,VAGENDA,OWNER,NONE,ZEROORONE +PUBLISH,VAGENDA,RELCALID,NONE,ZEROORONE +PUBLISH,VAGENDA,TZID,NONE,ONE +REQUEST,VAGENDA,NONE,NONE,ONEPLUS +REQUEST,VAGENDA,CALMASTER,NONE,ONE +REQUEST,VAGENDA,OWNER,NONE,ZEROORONE +REQUEST,VAGENDA,RELCALID,NONE,ZEROORONE +REQUEST,VAGENDA,TZID,NONE,ONE +REPLY,VAGENDA,NONE,NONE,ONEPLUS +REPLY,VAGENDA,CALMASTER,NONE,ONE +REPLY,VAGENDA,OWNER,NONE,ZEROORONE +REPLY,VAGENDA,RELCALID,NONE,ZEROORONE +REPLY,VAGENDA,TZID,NONE,ONE +ADD,VAGENDA,NONE,NONE,ONEPLUS +ADD,VAGENDA,CALMASTER,NONE,ONE +ADD,VAGENDA,OWNER,NONE,ZEROORONE +ADD,VAGENDA,RELCALID,NONE,ZEROORONE +ADD,VAGENDA,TZID,NONE,ONE +CANCEL,VAGENDA,NONE,NONE,ONEPLUS +CANCEL,VAGENDA,CALMASTER,NONE,ONE +CANCEL,VAGENDA,OWNER,NONE,ZEROORONE +CANCEL,VAGENDA,RELCALID,NONE,ZEROORONE +CANCEL,VAGENDA,TZID,NONE,ONE +REFRESH,VAGENDA,NONE,NONE,ONEPLUS +REFRESH,VAGENDA,CALMASTER,NONE,ONE +REFRESH,VAGENDA,OWNER,NONE,ZEROORONE +REFRESH,VAGENDA,RELCALID,NONE,ZEROORONE +REFRESH,VAGENDA,TZID,NONE,ONE +COUNTER,VAGENDA,NONE,NONE,ONEPLUS +COUNTER,VAGENDA,CALMASTER,NONE,ONE +COUNTER,VAGENDA,OWNER,NONE,ZEROORONE +COUNTER,VAGENDA,RELCALID,NONE,ZEROORONE +COUNTER,VAGENDA,TZID,NONE,ONE +DECLINECOUNTER,VAGENDA,NONE,NONE,ONEPLUS +DECLINECOUNTER,VAGENDA,CALMASTER,NONE,ONE +DECLINECOUNTER,VAGENDA,OWNER,NONE,ZEROORONE +DECLINECOUNTER,VAGENDA,RELCALID,NONE,ZEROORONE +DECLINECOUNTER,VAGENDA,TZID,NONE,ONE +NONE,VAGENDA,ALLOWCONFLICT,NONE,ONE +NONE,VAGENDA,CALMASTER,NONE,ONE +NONE,VAGENDA,OWNER,NONE,ZEROORONE +NONE,VAGENDA,RELCALID,NONE,ZEROORONE +NONE,VAGENDA,TZID,NONE,ONE +NONE,VAGENDA,DEFAULTCHARSET,NONE,ONE +NONE,VAGENDA,DEFAULTLOCALE,NONE,ONE +NONE,VAGENDA,DEFAULTTZID,NONE,ONE NONE,VCALENDAR,ACTION,NONE,ZERO NONE,VCALENDAR,ATTACH,NONE,ZERO NONE,VCALENDAR,ATTENDEE,NONE,ZERO +NONE,VCALENDAR,RELCALID,NONE,ZEROORONE NONE,VCALENDAR,CALSCALE,NONE,ZEROORONE NONE,VCALENDAR,CATEGORIES,NONE,ZERO NONE,VCALENDAR,CLASS,NONE,ZERO @@ -833,7 +898,7 @@ NONE,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration NONE,VEVENT,DTSTAMP,NONE,ZEROORONE NONE,VEVENT,DTSTART,NONE,ZEROORONE NONE,VEVENT,DUE,NONE,ZERO -NONE,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_duration +NONE,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_dtend NONE,VEVENT,EXDATE,NONE,ZEROPLUS NONE,VEVENT,EXRULE,NONE,ZEROPLUS NONE,VEVENT,FREEBUSY,NONE,ZERO @@ -866,6 +931,7 @@ NONE,VEVENT,UID,NONE,ZEROORONE NONE,VEVENT,URL,NONE,ZEROORONE NONE,VEVENT,VERSION,NONE,ZERO NONE,VEVENT,X,NONE,ZEROPLUS +NONE,VEVENT,RELCALID,NONE,ZEROORONE NONE,VTODO,ACTION,NONE,ZERO NONE,VTODO,ATTACH,NONE,ZEROPLUS NONE,VTODO,ATTENDEE,NONE,ZEROPLUS @@ -914,6 +980,7 @@ NONE,VTODO,UID,NONE,ZEROORONE NONE,VTODO,URL,NONE,ZEROORONE NONE,VTODO,VERSION,NONE,ZERO NONE,VTODO,X,NONE,ZEROPLUS +NONE,VTODO,RELCALID,NONE,ZEROORONE NONE,VJOURNAL,ACTION,NONE,ZERO NONE,VJOURNAL,ATTACH,NONE,ZEROPLUS NONE,VJOURNAL,ATTENDEE,NONE,ZEROPLUS @@ -1058,6 +1125,8 @@ NONE,VTIMEZONE,UID,NONE,ZERO NONE,VTIMEZONE,URL,NONE,ZERO NONE,VTIMEZONE,VERSION,NONE,ZERO NONE,VTIMEZONE,X,NONE,ZEROORONE +NONE,VTIMEZONE,NONE,XSTANDARD,ZEROPLUS +NONE,VTIMEZONE,NONE,XDAYLIGHT,ZEROPLUS NONE,XSTANDARD,ACTION,NONE,ZERO NONE,XSTANDARD,ATTACH,NONE,ZERO NONE,XSTANDARD,ATTENDEE,NONE,ZERO @@ -1250,7 +1319,7 @@ NONE,XDISPLAYALARM,UID,NONE,ZERO NONE,XDISPLAYALARM,URL,NONE,ZERO NONE,XDISPLAYALARM,VERSION,NONE,ZERO NONE,XDISPLAYALARM,X,NONE,ZEROPLUS -NONE,XEMAILALARM,ACTION,NONE,ONE +NONE,XEMAILALARM,ACTION,NONE,ONE,must_be_email NONE,XEMAILALARM,ATTACH,NONE,ZEROPLUS NONE,XEMAILALARM,ATTENDEE,NONE,ONEPLUS NONE,XEMAILALARM,CALSCALE,NONE,ZERO @@ -1346,3 +1415,6 @@ NONE,XPROCEDUREALARM,UID,NONE,ZERO NONE,XPROCEDUREALARM,URL,NONE,ZERO NONE,XPROCEDUREALARM,VERSION,NONE,ZERO NONE,XPROCEDUREALARM,X,NONE,ZEROPLUS +NONE,VQUERY,QUERY,NONE,ZEROORONE +NONE,VQUERY,QUERYNAME,NONE,ONE +NONE,VQUERY,EXPAND,NONE,ONE diff --git a/libical/design-data/value-types.csv b/libical/design-data/value-types.csv index 654307097e..1e6b88b3c5 100644 --- a/libical/design-data/value-types.csv +++ b/libical/design-data/value-types.csv @@ -10,22 +10,26 @@ "PERIOD","(a)struct icalperiodtype","Period","unitary", "RECUR","(m)struct icalrecurrencetype","RecurrenceSet","unitary", "TEXT","(a)const char*","string","unitary", -"TIME","(a)struct icaltimetype","Time","unitary", "URI","(a)const char*","string","unitary", "UTC-OFFSET","(a)int","integer","unitary", "QUERY","(a)const char*","string","unitary", "#Non-standard multi-valued types",,,, "ATTACH","(m)icalattach *","none","URI;BINARY", -"DATE-TIME-DATE","(a)struct icaltimetype","none","DATE-TIME;DATE", "DATE-TIME-PERIOD","(m)struct icaldatetimeperiodtype","none","DATE-TIME;PERIOD", "TRIGGER","(m)struct icaltriggertype","string","DURATION;DATE-TIME", "#Non-standard property enumeration types",,,, "METHOD","(a)enum icalproperty_method","string","unitary","PUBLISH;REQUEST;REPLY;ADD;CANCEL;REFRESH;COUNTER;DECLINECOUNTER;CREATE;READ;RESPONSE;MOVE;MODIFY;GENERATEUID;DELETE" +"X-LIC-CLASS","(a)enum icalproperty_xlicclass","string","unitary","PUBLISH-NEW;PUBLISH-UPDATE;PUBLISH-FREEBUSY;REQUEST-NEW;REQUEST-UPDATE;REQUEST-RESCHEDULE;REQUEST-DELEGATE;REQUEST-NEW-ORGANIZER;REQUEST-FORWARD;REQUEST-STATUS;REQUEST-FREEBUSY;REPLY-ACCEPT;REPLY-DECLINE;REPLY-DELEGATE;REPLY-CRASHER-ACCEPT;REPLY-CRASHER-DECLINE;ADD-INSTANCE;CANCEL-EVENT;CANCEL-INSTANCE;CANCEL-ALL;REFRESH;COUNTER;DECLINECOUNTER;MALFORMED;OBSOLETE;MISSEQUENCED;UNKNOWN" "ACTION","(a)enum icalproperty_action","string","unitary","AUDIO;DISPLAY;EMAIL;PROCEDURE" "STATUS","(a)enum icalproperty_status","string","unitary","TENTATIVE;CONFIRMED;COMPLETED;NEEDS-ACTION;CANCELLED;IN-PROCESS;DRAFT;FINAL" -"TRANSP","(a)enum icalproperty_transp","string","unitary","OPAQUE;TRANSPARENT" +"TRANSP","(a)enum icalproperty_transp","string","unitary","OPAQUE;OPAQUE-NOCONFLICT;TRANSPARENT;TRANSPARENT-NOCONFLICT" "CLASS","(a)enum icalproperty_class","string","unitary","PUBLIC;PRIVATE;CONFIDENTIAL" "#Other non-standard",,,, +"REQUEST-STATUS","(a)struct icalreqstattype","string","unitary" "GEO","(a)struct icalgeotype","tuple","unitary", "STRING","(a)const char*","string","unitary", "X","(m)const char*","string","unitary", +"#CAP enumeration types",,,, +"CMD","(a)enum icalproperty_cmd","string","unitary","ABORT;CONTINUE;CREATE;DELETE;GENERATE-UID;GET-CAPABILITY;IDENTIFY;MODIFY;MOVE;REPLY;SEARCH;SET-LOCALE" +"QUERY-LEVEL","(a)enum icalproperty_querylevel","string","unitary","CAL-QL-1;CAL-QL-NONE" +"CAR-LEVEL","(a)enum icalproperty_carlevel","string","unitary","CAR-NONE;CAR-MIN;CAR-FULL-1" diff --git a/libical/doc/.cvsignore b/libical/doc/.cvsignore index 3dda72986f..bbc8ba00d1 100644 --- a/libical/doc/.cvsignore +++ b/libical/doc/.cvsignore @@ -1,2 +1,5 @@ -Makefile.in Makefile +.deps +.libs +*.lo +*.la diff --git a/libical/doc/AddingOrModifyingComponents.txt b/libical/doc/AddingOrModifyingComponents.txt new file mode 100644 index 0000000000..e9f46c2759 --- /dev/null +++ b/libical/doc/AddingOrModifyingComponents.txt @@ -0,0 +1,23 @@ + +How to add or change Components, Properties, Values or Parameters + + +Adding or modifying values +--------------------------- + +You may have to modify these files or data structures + +file design-data/value-c-types.txt +file design-data/prop-to-val.txt +table parameter_map[] in icalenums.c +enum icalvalue_kind in icalenum.h +table value_map[] in icalenums.c +enum icalparameter_value in icalenum.h +table propval_map[] in icalenums.c +function icalvalue_as_ical_string() in icalvalue.c +function icalvalue_new_from_string_with_error() in icalvalue.c + +When you are done, if you changed any files in the design-data +directory, regnerate derived datatypes in src/libical with "make +derived" or "make icalvalue" + diff --git a/libical/doc/UsingLibical.lyx b/libical/doc/UsingLibical.lyx index cef199bea5..02655a3121 100644 --- a/libical/doc/UsingLibical.lyx +++ b/libical/doc/UsingLibical.lyx @@ -128,7 +128,7 @@ src/test \layout Section -Building nas Installing the Library +Building and Installing the Library \layout Standard Libical uses autoconf to generate makefiles. @@ -1001,6 +1001,12 @@ n"); } \layout LyX-Code + if (line != 0) +\layout LyX-Code + + icalmemory_free_buffer(line); +\layout LyX-Code + } while ( line != 0); \layout LyX-Code diff --git a/libical/examples/.cvsignore b/libical/examples/.cvsignore index 29ef3ef4c8..14459733c2 100644 --- a/libical/examples/.cvsignore +++ b/libical/examples/.cvsignore @@ -1,5 +1,6 @@ -.libs -.deps Makefile -Makefile.in +.deps +.libs +*.lo +*.la doesnothing diff --git a/libical/examples/Makefile.am b/libical/examples/Makefile.am index 99e33d3400..ea8dc02c3d 100644 --- a/libical/examples/Makefile.am +++ b/libical/examples/Makefile.am @@ -1,10 +1,15 @@ noinst_PROGRAMS = doesnothing -LDADD = ../src/libical/libical.a ../src/libicalss/libicalss.la ../src/libicalvcal/libicalvcal.la -INCLUDES = -I . -I../src/libical -I$(srcdir)/../src/libical -I../src/libicalss -I../src/libicalvcal +if WITH_BDB4 +doesnothing_LDADD = ../src/libical/libical.la ../src/libicalss/libicalss.la ../src/libicalvcal/libicalvcal.la @BDB_DIR_LIB@/@BDB_LIB@ +else +doesnothing_LDADD = ../src/libical/libical.la ../src/libicalss/libicalss.la ../src/libicalvcal/libicalvcal.la +endif -INCLUDES = -I. -I../src/libical -I$(srcdir)/../src/libical -I../src/libicalss -I../src/libicalvcal +LIBS = @PTHREAD_LIBS@ + +INCLUDES = -I. -I../src/libical -I$(srcdir)/../src/libical -I../src/libicalss -I../src/libicalvcal doesnothing_SOURCES = \ access_components.c \ diff --git a/libical/examples/access-usecases.txt b/libical/examples/access-usecases.txt new file mode 100644 index 0000000000..9bcb7544c3 --- /dev/null +++ b/libical/examples/access-usecases.txt @@ -0,0 +1,60 @@ + + +Usecases +--------- + +1) iMIP based CUA uses a local, file-based store + +2) CAP based CUA uses one or more remote CAP servers + +3) CAP based CUA uses a local cache that synchronizes with one or more +CAP servers. + +4) CUA imports and exports from a file + +Scenarios. +--------- + +1 Open a connection to a store. + +2 Create a new calendar for which user Bob can read and user Alice can +read an write. + +3 Create several new calendars + +4 Delete a calendar + +5 Change the calid of a calendar + +6 Delete all calendars belonging to user bob + +7 Get three new UIDs from the store + +8 Store a new VEVENT in the store. + +9 Find all components for which the LOCATION is "West Conference Room" +and change them to "East Conference Room" + +10 Find the component with UID X and add a GEO property to it. + +11 Delete all VEVENTS which have a METHOD that is not CREATED + +12 Retrieve all VEVENTS which have a METHOD that is not CREATED + +13 Retrieve the capabilities of the store + +14 Retrieve/Modify/Add/Delete properties of a store + +15 Retrieve/Modify/Add/Delete VCARs of a store + +16 Retrieve/Modify/Add/Delete VTIMEZONEs of a store + +17 Retrieve/Modify/Add/Delete properties of a calendar + +18 Retrieve/Modify/Add/Delete VCARs of a calendar + +19 Retrieve/Modify/Add/Delete VTIMEZONEs of a calendar + +20 Translate a CALID into one or more UPNs + +21 Expand a group UPN into all of the members of the group \ No newline at end of file diff --git a/libical/examples/access_components.c b/libical/examples/access_components.c index cc5a33d6d2..dc92b64a7c 100644 --- a/libical/examples/access_components.c +++ b/libical/examples/access_components.c @@ -7,7 +7,6 @@ #include /* for malloc */ #include /* for printf */ #include /* for time() */ -#include "icalmemory.h" void do_something(icalcomponent *c); @@ -154,7 +153,7 @@ icalcomponent* create_new_component() icalcomponent_add_property( event, - icalproperty_new_class("PUBLIC") + icalproperty_new_class(ICAL_CLASS_PUBLIC) ); icalcomponent_add_property( @@ -242,7 +241,7 @@ icalcomponent* create_new_component_with_va_args() icalproperty_new_description("Project XYZ Review Meeting"), icalproperty_new_categories("MEETING"), - icalproperty_new_class("PUBLIC"), + icalproperty_new_class(ICAL_CLASS_PUBLIC), icalproperty_new_created(atime), icalproperty_new_summary("XYZ Project Review"), icalproperty_vanew_dtstart( diff --git a/libical/examples/access_store.c b/libical/examples/access_store.c new file mode 100644 index 0000000000..fc2f5b01e2 --- /dev/null +++ b/libical/examples/access_store.c @@ -0,0 +1,210 @@ + + +void acess_cap(void) { + + /* Note, all routines that are prefixed with "caller_" are + implemented by the caller of libical */ + +/* 1 Open a connection to a store. */ + + /* The caller is responsible for getting a socket to the server + and negotiating the first stages of the CAP exchange. These can + be fairly complex and varied for different operating systems, + local vs remote usage, and for different authentication + schemes, so the API does not try to simplify them. */ + + int sock = caller_create_socket_to_server(); + icalcstp *cstp = icalcstp_new(0,sock,sock); + + caller_authenticate(cstp); + + icalcsdb *csdb = icalcsdb_new(cstp); + +/* 2 Create a new calendar for which user Bill can read and user Mary can +read and write. See CAP draft 7.2.1.1.1. for the text of this example*/ + + /* This case requires setting up a TARGET, multiple OWNERs and + multiple VCARs, so it creates a component and uses CSTP that + than the CSDB interface. + + icalcomponent *create = icalcaputil_new_create(); + + icalcomponent_add_property(create, + icalproperty_new_target( + strdup("cap://cal.example.com/relcal8") + )); + + icalcomponent *cal = + icalcomponent_vanew_vcalendar( + icalproperty_new_relcalid(strdup("relcalid")), + icalproperty_new_name(strdup("Bill & Mary's cal")), + icalproperty_new_owner(strdup("bill")), + icalproperty_new_owner(strdup("mary")), + icalproperty_new_calmaster(strdup("mailto:bill@example.com")), + icalcomponent_vanew_vcar( + icalproperty_new_grant(strdup("UPN=bill;ACTION=*;OBJECT=*")), + icalproperty_new_grant(strdup("UPN=bill;ACTION=*;OBJECT=*")) + 0) + 0); + + error = icalcomponent_add_component(create,cal); + + /* Send the data */ + error = icalcstp_senddata(cstp,10,create); + + + /* Get the response */ + icalcstp_response response = icalcstp_get_first_response(cstp); + + /* Do something with the response*/ + + if(icalenum_reqstat_major(response.code) != 2){ + /* do something with the error */ + } + + icalcomponent_free(create); + + +/* 3 Create several new calendars */ + + /* Same as #2, but insert more TARGET properties and read more responses*/ + +/* 4 Delete a calendar */ + + error = icalcsdb_delete(csdb,"uid12345-example.com"); + +/* 5 Change the calid of a calendar */ + + erorr = icalcsdb_move(csdb,"uid12345-old-example.com", + "uid12345-new-example.com"); + + +/* 6 Delete all calendars belonging to user bob */ + + icalproperty *p; + /* First expand bob's UPN into a set of CALIDs */ + icalcomponent *calids = icalcsdb_expand_upn("bob@example.com"); + + /* Then, create a message to delete all of them */ + icalcomponent *delete = icalcaputil_new_create(); + + + for(p = icalcomponent_get_first_property(calids,ICAL_CALID_PROPERTY); + p != 0; + p = icalcomponent_get_next_property(calids,ICAL_CALID_PROPERTY)){ + + char* = icalproperty_get_calid(p); + + icalcomponent_add_target(delete,p); + + } + + /* Send the message */ + + error = icalcstp_senddata(cstp,10,delete); + + /* Finally, read the responses */ + + for(response = icalcstp_get_first_response(cstp); + response.code != ICAL_UNKNOWN_STATUS; + response = icalcstp_get_next_response(cstp)){ + + if(icalenum_reqstat_major(response.code) != 2){ + /* do something with the error */ + } + } + + +/* 7 Get three new UIDs from the store */ + + /* libical owns the returned memory. Copy before using */ + char* uid1 = icalcsdb_generateuid(csdb); + char* uid2 = icalcsdb_generateuid(csdb); + char* uid3 = icalcsdb_generateuid(csdb); + +/* 8 Store a new VEVENT in the store. */ + + /* Very similar to case #2 */ + +/* 9 Find all components for which the LOCATION is "West Conference +Room" and change them to "East Conference Room" */ + + icalcomponent *modify = icalcaputil_new_modify(); + + icalcaputil_modify_add_old_prop(modify, + icalproperty_new_location( + strdup("West Conference Room"))); + + icalcaputil_modify_add_new_prop(modify, + icalproperty_new_location( + strdup("East Conference Room"))); + + icalcaputil_add_target(modify,"relcal2"); + + /* Send the component */ + error = icalcstp_senddata(cstp,10,delete); + + /* Get the response */ + icalcstp_response response = icalcstp_get_first_response(cstp); + + /* Do something with the response*/ + + if(icalenum_reqstat_major(response.code) != 2){ + /* do something with the error */ + } + + icalcomponent_free(modify); + +/* 10 Find the component with UID X and add a GEO property to it. */ + + + icalcomponent *modify = icalcaputil_new_modify(); + + icalcaputil_modify_add_query(modify, + "SELECT UID FROM VEVENT WHERE UID = 'X'"); + + icalcaputil_modify_add_new_prop(modify, + icalproperty_new_geo( + strdup("-117;32"))); + + icalcaputil_add_target(modify,"relcal2"); + + /* Send the component */ + error = icalcstp_senddata(cstp,10,delete); + + /* Get the response */ + icalcstp_response response = icalcstp_get_first_response(cstp); + + /* Do something with the response*/ + + if(icalenum_reqstat_major(response.code) != 2){ + /* do something with the error */ + } + + icalcomponent_free(modify); + + +/* 11 Delete all VEVENTS which have a METHOD that is not CREATED */ + + +/* 12 Retrieve all VEVENTS which have a METHOD that is not CREATED */ + + /* Nearly the same at #11 */ + +/* 13 Retrieve the capabilities of the store */ + +/* 14 Retrieve/Modify/Add/Delete properties of a store */ + +/* 15 Retrieve/Modify/Add/Delete VCARs of a store */ + +/* 16 Retrieve/Modify/Add/Delete VTIMEZONEs of a store */ + +/* 17 Retrieve/Modify/Add/Delete properties of a calendar */ + +/* 18 Retrieve/Modify/Add/Delete VCARs of a calendar */ + +/* 19 Retrieve/Modify/Add/Delete VTIMEZONEs of a calendar */ + +/* 20 Translate a CALID into one or more UPNs */ + +/* 21 Expand a group UPN into all of the members of the group */ diff --git a/libical/examples/changenames.pl b/libical/examples/changenames.pl new file mode 100644 index 0000000000..4adf84b9c0 --- /dev/null +++ b/libical/examples/changenames.pl @@ -0,0 +1,4 @@ +s/icalcluster/icalfileset/g; +s/ICALCLUSTER/ICALFILESET/g; +s/icalstore/icaldirset/g; +s/ICALSTORE/ICALDIRSET/g; diff --git a/libical/examples/usecases.c b/libical/examples/usecases.c new file mode 100644 index 0000000000..116be30a59 --- /dev/null +++ b/libical/examples/usecases.c @@ -0,0 +1,89 @@ +/* -*- Mode: C -*- + ====================================================================== + FILE: usecases.c + CREATOR: eric 03 April 1999 + + DESCRIPTION: + + $Id$ + $Locker$ + + (C) COPYRIGHT 1999 Eric Busboom + http://www.softwarestudio.org + + The contents of this file are subject to the Mozilla Public License + Version 1.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.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + the License for the specific language governing rights and + limitations under the License. + + The original author is Eric Busboom + The original code is usecases.c + + + ======================================================================*/ + +#include "ical.h" +#include +#include /* for strdup */ +#include /* for malloc */ +#include /* for printf */ +#include /* for time() */ + +char str[] = "BEGIN:VCALENDAR\ +PRODID:\"-//RDU Software//NONSGML HandCal//EN\"\ +VERSION:2.0\ +BEGIN:VEVENT\ +DTSTAMP:19980309T231000Z\ +UID:guid-1.host1.com\ +ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com\ +ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com\ +DESCRIPTION:Project XYZ Review Meeting\ +CATEGORIES:MEETING\ +CREATED:19980309T130000Z\ +SUMMARY:XYZ Project Review\ +DTSTART;TZID=US-Eastern:19980312T083000\ +DTEND;TZID=US-Eastern:19980312T093000\ +END:VEVENT\ +END:VCALENDAR"; + + + + +/* Here are some ways to work with values. */ +void test_values() +{ + icalvalue *v; + icalvalue *copy; + + v = icalvalue_new_caladdress("cap://value/1"); + printf("caladdress 1: %s\n",icalvalue_get_caladdress(v)); + + icalvalue_set_caladdress(v,"cap://value/2"); + printf("caladdress 2: %s\n",icalvalue_get_caladdress(v)); + printf("String: %s\n",icalvalue_as_ical_string(v)); + + copy = icalvalue_new_clone(v); + printf("Clone: %s\n",icalvalue_as_ical_string(v)); + icalvalue_free(v); + icalvalue_free(copy); + + +} + +void test_parameters() +{ + icalparameter *p; + + p = icalparameter_new_cn("A Common Name"); + + printf("Common Name: %s\n",icalparameter_get_cn(p)); + + printf("As String: %s\n",icalparameter_as_ical_string(p)); +} + + diff --git a/libical/scripts/.cvsignore b/libical/scripts/.cvsignore index b840c21800..bbc8ba00d1 100644 --- a/libical/scripts/.cvsignore +++ b/libical/scripts/.cvsignore @@ -1,2 +1,5 @@ -Makefile.in -Makefile \ No newline at end of file +Makefile +.deps +.libs +*.lo +*.la diff --git a/libical/scripts/mkderivedcomponents.pl b/libical/scripts/mkderivedcomponents.pl index ac4e472250..31743c3ba3 100755 --- a/libical/scripts/mkderivedcomponents.pl +++ b/libical/scripts/mkderivedcomponents.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/env perl use Getopt::Std; getopts('chspi:'); diff --git a/libical/scripts/mkderivedparameters.pl b/libical/scripts/mkderivedparameters.pl index 89f25306a5..5439509aa8 100755 --- a/libical/scripts/mkderivedparameters.pl +++ b/libical/scripts/mkderivedparameters.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/env perl require "readvaluesfile.pl"; @@ -18,27 +18,24 @@ if ($opt_i) { open(IN,$opt_i) || die "Can't open input file $opt_i"; while(){ - - if (/Do not edit/){ - last; - } - - print; + if (//){ + insert_code(); + } else { + print; + } } if($opt_p){ - print "# Everything below this line is machine generated. Do not edit. \n"; + print "# Everything below this line is machine generated. Do not edit. \n"; } else { print "/* Everything below this line is machine generated. Do not edit. */\n"; } } - -# Write parameter string map -if ($opt_c){ -} +sub insert_code +{ # Write parameter enumerations and datatypes @@ -108,21 +105,28 @@ if($opt_h){ if ($opt_c){ - # Create the icalparameter_value to icalvalue_kind conversion table - print "struct icalparameter_value_kind_map value_kind_map[] = {\n"; + # Create the icalparameter_value to icalvalue_kind conversion table + my $count = 0; + my $out; + foreach $enum (@{$params{'VALUE'}->{'enums'}}){ next if $enum eq 'NO' or $enum eq 'ERROR'; $uc = join("",map {uc(lc($_));} split(/-/,$enum)); - print " {ICAL_VALUE_${uc},ICAL_${uc}_VALUE},\n"; + $out.=" {ICAL_VALUE_${uc},ICAL_${uc}_VALUE},\n"; + $count++; } - + + $count+=2; + print "static struct icalparameter_value_kind_map value_kind_map[$count] = {\n"; + print $out; print " {ICAL_VALUE_X,ICAL_X_VALUE},\n"; print " {ICAL_VALUE_NONE,ICAL_NO_VALUE}\n};\n\n"; #Create the parameter Name map - print "static struct icalparameter_kind_map parameter_map[] = { \n"; + $out=""; + $count=0; foreach $param (sort keys %params) { next if !$param; @@ -132,18 +136,18 @@ if ($opt_c){ my $lc = join("",map {lc($_);} split(/-/,$param)); my $uc = join("",map {uc(lc($_));} split(/-/,$param)); - - print " {ICAL_${uc}_PARAMETER,\"$param\"},\n"; + $count++; + $out.=" {ICAL_${uc}_PARAMETER,\"$param\"},\n"; } - + $count+=1; + print "static struct icalparameter_kind_map parameter_map[$count] = { \n"; + print $out; print " { ICAL_NO_PARAMETER, \"\"}\n};\n\n"; # Create the parameter value map - - print "static struct icalparameter_map icalparameter_map[] = {\n"; - print "{ICAL_ANY_PARAMETER,0,\"\"},\n"; - + $out =""; + $count=0; foreach $param (sort keys %params) { next if !$param; @@ -159,12 +163,17 @@ if ($opt_c){ foreach $e (@enums){ my $uce = join("",map {uc(lc($_));} split(/-/,$e)); - print " {ICAL_${uc}_PARAMETER,ICAL_${uc}_${uce},\"$e\"},\n"; + $count++; + $out.=" {ICAL_${uc}_PARAMETER,ICAL_${uc}_${uce},\"$e\"},\n"; } } } + $count+=3; + print "static struct icalparameter_map icalparameter_map[] = {\n"; + print "{ICAL_ANY_PARAMETER,0,\"\"},\n"; + print $out; print " {ICAL_NO_PARAMETER,0,\"\"}};\n\n"; } @@ -186,20 +195,18 @@ foreach $param (keys %params){ if ($type=~/char/ ) { - $charorenum = " icalerror_check_arg_rz( (param!=0), \"param\");\n return ($type)((struct icalparameter_impl*)param)->string;"; + $charorenum = " icalerror_check_arg_rz( (param!=0), \"param\");\n return param->string;"; - $set_code = "if (((struct icalparameter_impl*)param)->string != 0)\n" . - " free((void *) ((struct icalparameter_impl*)param)->string);\n" . - " ((struct icalparameter_impl*)param)->string = icalmemory_strdup(v);"; + $set_code = "((struct icalparameter_impl*)param)->string = icalmemory_strdup(v);"; $pointer_check = "icalerror_check_arg_rz( (v!=0),\"v\");"; $pointer_check_v = "icalerror_check_arg_rv( (v!=0),\"v\");"; } else { - $xrange =" if ( ((struct icalparameter_impl*)param)->string != 0){\n return ICAL_${uc}_X;\n }\n" if !exists $no_xname{$uc}; + $xrange =" if (param->string != 0){\n return ICAL_${uc}_X;\n }\n" if !exists $no_xname{$uc}; - $charorenum= "icalerror_check_arg( (param!=0), \"param\");\n$xrange\nreturn ($type)((struct icalparameter_impl*)param)->data;"; + $charorenum= "icalerror_check_arg( (param!=0), \"param\");\n$xrange\nreturn ($type)(param->data);"; $pointer_check = "icalerror_check_arg_rz(v >= ICAL_${uc}_X,\"v\");\n icalerror_check_arg_rz(v < ICAL_${uc}_NONE,\"v\");"; @@ -234,7 +241,7 @@ icalparameter* icalparameter_new_${lc}($type v) return (icalparameter*) impl; } -${type} icalparameter_get_${lc}(icalparameter* param) +${type} icalparameter_get_${lc}(const icalparameter* param) { icalerror_clear_errno(); $charorenum @@ -256,7 +263,7 @@ EOM print <){ - if (/Do not edit/){ - last; - } - - print; - + if (//){ + insert_code(); + } else { + print; + } + } - - print "/* Everything below this line is machine generated. Do not edit. */\n"; - - + } sub fudge_data { @@ -56,12 +55,19 @@ sub fudge_data { } +sub insert_code { + # Create the property map data if($opt_c){ - print "static struct icalproperty_map property_map[] = {\n"; + + my @props = sort keys %propmap; + my $count = scalar(@props); - foreach $prop (sort keys %propmap) { + + print "static struct icalproperty_map property_map[$count] = {\n"; + + foreach $prop (@props) { next if !$prop; @@ -79,10 +85,9 @@ if($opt_c){ print "{ICAL_${uc}_PROPERTY,\"\",ICAL_NO_VALUE}};\n\n"; - - print "static struct icalproperty_enum_map enum_map[] = {\n"; - $idx = 10000; + $count = 1; + my $out = ""; foreach $value (sort keys %valuemap) { @@ -109,14 +114,20 @@ if($opt_c){ $str = ""; } - print " {ICAL_${ucv}_PROPERTY,ICAL_${ucv}_${uce},\"$str\" }, /*$idx*/\n"; + $out.=" {ICAL_${ucv}_PROPERTY,ICAL_${ucv}_${uce},\"$str\" }, /*$idx*/\n"; $idx++; + $count++; } } } + + $count++; + print "static struct icalproperty_enum_map enum_map[$count] = {\n"; + print $out; print " {ICAL_NO_PROPERTY,0,\"\"}\n};\n\n"; + } @@ -163,13 +174,9 @@ foreach $prop (sort keys %propmap) { my $set_pointer_check = "icalerror_check_arg_rv( (v!=0),\"v\");\n" if $type =~ /\*/; if($opt_c) { # Generate C source - print<){ - print; - } -} + if (//){ + insert_code(); + } else { + print; + } + + } +} +sub insert_code +{ # Map type names to the value in the icalvalue_impl data union */ %union_map = ( @@ -122,7 +129,8 @@ if($opt_c){ # print out the value to string map - print "static struct icalvalue_kind_map value_map[]={\n"; + my $count = scalar(keys %h) + 1; + print "static struct icalvalue_kind_map value_map[$count]={\n"; foreach $value (keys %h) { @@ -157,10 +165,8 @@ foreach $value (keys %h) { if ($type =~ /char/){ $assign = "icalmemory_strdup(v);\n\n if (impl->data.v_string == 0){\n errno = ENOMEM;\n }\n"; - $check_arg = "icalerror_check_arg_rz( (value!=0),\"value\");"; } else { $assign = "v;"; - $check_arg = "icalerror_check_arg( (value!=0),\"value\");"; } my $union_data; @@ -196,10 +202,12 @@ void icalvalue_set_${lc}(icalvalue* value, $type v) {\ } - print "\n impl->data.v_$union_data = $assign \n }\n"; + print "\n\ + impl->data.v_$union_data = $assign \n\ + icalvalue_reset_kind(impl);\n}\n"; - print "$type\ icalvalue_get_${lc}(icalvalue* value)\ {\n\ - $check_arg\ + print "$type\ icalvalue_get_${lc}(const icalvalue* value)\ {\n\ + icalerror_check_arg( (value!=0),\"value\");\ icalerror_check_value_type(value, ICAL_${uc}_VALUE);\ return ((struct icalvalue_impl*)value)->data.v_${union_data};\n}\n"; @@ -208,7 +216,7 @@ void icalvalue_set_${lc}(icalvalue* value, $type v) {\ print "\n /* $value */ \ icalvalue* icalvalue_new_${lc}($type v); \ -$type icalvalue_get_${lc}(icalvalue* value); \ +$type icalvalue_get_${lc}(const icalvalue* value); \ void icalvalue_set_${lc}(icalvalue* value, ${type} v);\n\n"; } @@ -220,6 +228,5 @@ if ($opt_h){ print "#endif /*ICALVALUE_H*/\n"; } - - __END__ - + +} diff --git a/libical/scripts/mkinclude.sh b/libical/scripts/mkinclude.sh new file mode 100644 index 0000000000..a77c8d74a8 --- /dev/null +++ b/libical/scripts/mkinclude.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# +# Given a list of headers, combine them into one, excluding certain lines +# +OUTFILE="/dev/stdout" +COMBINEDHEADERS="" +EXCLUDES="" + +while [ $# -gt 0 ] +do + case $1 in + -o) OUTFILE=$2; shift;; + -e) EXCLUDES="$EXCLUDES $2"; shift;; + *) COMBINEDHEADERS="$COMBINEDHEADERS $1"; + esac + shift +done + +echo '#ifdef __cplusplus' > $OUTFILE +echo 'extern "C" {' >> $OUTFILE +echo '#endif' >> $OUTFILE +echo '/*' >> $OUTFILE +echo " \$Id\$" >> $OUTFILE +echo '*/' >> $OUTFILE +cat $COMBINEDHEADERS >> file.temp1 +for exclude in $EXCLUDES +do + cp file.temp1 file.temp2 + egrep -v "$exclude" file.temp2 > file.temp1 +done +cat file.temp1 >> $OUTFILE +rm -f file.temp1 +rm -f file.temp2 +echo '#ifdef __cplusplus' >> $OUTFILE +echo '};' >> $OUTFILE +echo '#endif' >> $OUTFILE + + diff --git a/libical/scripts/mkneticali.pl b/libical/scripts/mkneticali.pl new file mode 100755 index 0000000000..937de49908 --- /dev/null +++ b/libical/scripts/mkneticali.pl @@ -0,0 +1,99 @@ +#!/usr/local/bin/perl + +$pr = 1; +$ignore = 0; + + +print< /* for size_t */ +#include + +%} + +EOM + +foreach $f (@ARGV) +{ + @f = split(/\//,$f); + $fn = pop(@f); + + $fn=~/pvl/ && next; + $fn=~/sspm/ && next; + $fn=~/cstp/ && next; + $fn=~/csdb/ && next; + $fn=~/vcal/ && next; + $fn=~/yacc/ && next; + $fn=~/lex/ && next; + + print "\n/**********************************************************************\n"; + + print "\t$fn\n"; + print "**********************************************************************/\n\n"; + + + open F, $f; + + while(){ + + s/^#.*//; + + s/\/\*.*\*\///; + + /^\/\// && next; + + next if /^$/; + + if(/\/\*/){ $pr = 0;} + + /icalparser_parse\(/ and $ignore = 1; + /vanew/ and $ignore = 1; + /_stub/ and $ignore = 1; + /_response/ and $ignore = 1; + /line_gen_func/ and $ignore = 1; + /extern/ and $ignore = 1; + /sspm/ and $ignore = 1; + /icalrecur/ and $ignore = 1; + + if ($pr == 1 && $ignore == 0){ + print ; + } + + + if(/\*\//){ $pr = 1;} + + if (/\;/){ $ignore = 0; } + + } + +} + + diff --git a/libical/scripts/mkrestrictionrecords.pl b/libical/scripts/mkrestrictionrecords.pl index e2c62ae748..dd28d77708 100755 --- a/libical/scripts/mkrestrictionrecords.pl +++ b/libical/scripts/mkrestrictionrecords.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # Version: 1.0 # Script last updated: 30May1999 GMD diff --git a/libical/scripts/mkrestrictiontable.pl b/libical/scripts/mkrestrictiontable.pl index e1e1a0ca53..e02c55b2f9 100755 --- a/libical/scripts/mkrestrictiontable.pl +++ b/libical/scripts/mkrestrictiontable.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use Getopt::Std; getopts('i:'); diff --git a/libical/scripts/readvaluesfile.pl b/libical/scripts/readvaluesfile.pl index d5e2d36fd8..cb40db84ff 100644 --- a/libical/scripts/readvaluesfile.pl +++ b/libical/scripts/readvaluesfile.pl @@ -13,6 +13,7 @@ sub read_values_file { s/#.*$//g; s/\"//g; + s/\r//g; next if ! $_; @@ -69,6 +70,7 @@ sub read_properties_file { s/#.*$//g; s/\"//g; + s/\r//g; next if ! $_; @@ -100,6 +102,7 @@ sub read_parameters_file { s/#.*$//g; s/\"//g; + s/\r//g; next if ! $_; diff --git a/libical/src/.cvsignore b/libical/src/.cvsignore index c038ed7864..bbc8ba00d1 100644 --- a/libical/src/.cvsignore +++ b/libical/src/.cvsignore @@ -1,2 +1,5 @@ Makefile -Makefile.in \ No newline at end of file +.deps +.libs +*.lo +*.la diff --git a/libical/src/Makefile.am b/libical/src/Makefile.am index 7a3f9fcdff..5e5cd331db 100644 --- a/libical/src/Makefile.am +++ b/libical/src/Makefile.am @@ -4,6 +4,16 @@ else PYTHON_DIR = endif -# For evolution we only build libical at present. -SUBDIRS = libical libicalvcal -#SUBDIRS = libical libicalss libicalvcal # $(PYTHON_DIR) test +if WITH_JAVA +JAVA_DIR = java +else +JAVA_DIR = +endif + +if WITH_CAP +LIBICALCAP_DIR = libicalcap +else +LIBICALCAP_DIR = +endif + +SUBDIRS = libical libicalss $(LIBICALCAP_DIR) libicalvcal $(PYTHON_DIR) $(JAVA_DIR) test diff --git a/libical/src/Net-ICal-Libical/MANIFEST b/libical/src/Net-ICal-Libical/MANIFEST new file mode 100644 index 0000000000..1a6880e8b4 --- /dev/null +++ b/libical/src/Net-ICal-Libical/MANIFEST @@ -0,0 +1,16 @@ +MANIFEST +Makefile.PL +lib/Net/ICal/Libical.pm +netical.i +netical_wrap.c +netical_wrap.doc +test-data/2446.mime +test-data/error +test-data/mail-examples +test-data/no-error +test-data/rfc2445.ics +test-data/rfc2446.ics +test-data/single-with-error +test/example.pl +test/libical.pl +test/swig.pl diff --git a/libical/src/Net-ICal-Libical/Makefile.PL b/libical/src/Net-ICal-Libical/Makefile.PL new file mode 100644 index 0000000000..f46c61bc02 --- /dev/null +++ b/libical/src/Net-ICal-Libical/Makefile.PL @@ -0,0 +1,42 @@ +#!/usr/bin/perl +# -*- Mode: perl -*- + +use ExtUtils::MakeMaker; +WriteMakefile( + 'MAKEFILE'=> 'Makefile', + 'VERSION_FROM' => 'lib/Net/ICal/Libical.pm', + 'NAME' => 'Net::ICal::Libical', + 'INC' => '-I../libical -I ../libicalss', + 'LIBS' => ['-L../libical/.libs -L../libicalss/.libs -lical -licalss -lm'], + 'OBJECT' => 'netical_wrap.o', # Object files + dist => { + COMPRESS =>'gzip', + SUFFIX =>'gz' + }, + + ); + +sub MY::top_targets +{ + my $self = shift; + + my $old = $self->MM::top_targets; + + return "all:: netical_wrap.o\n$old"; + +} + +sub MY::postamble +{ + + return <dict{TZID} +sub timezone(self,v=None): + + +# Represents the value and all parameters of an attendee +package Net::ICal::Libical::Attendee(Property): +@ISA = (Property); + +sub new{} + +# Methods for accessing enumerated parameters +sub cn {} +sub cutype {} +sub dir {} +sub delegated_from {} +sub delegated_to {} +sub language {} +sub member {} +sub partstat {} +sub role {} +sub rsvp {} +sub sent_by {} + + +package Net::ICal::Libical::Organizer; +@ISA = (Property) +# Methods for accessing enumerated parameters +sub cn{} +sub dir{} +sub language {} +sub sent_by {} + +package Net::ICal::Libical::Recurrence_Id; +@ISA= (Property) + +package Net::ICal::Libical::Attach; +@ISA= (Property) + +package Net::ICal::Libical::Event; +@ISA= (Component) + +sub component_type {} + +#"Returns a copy of the object." +sub clone {} + +#Sets or returns the value of the DTEND property. +#Usage: +#dtend(time_obj) # Set the value using a Time object +#dtend('19970101T123000Z') # Set the value as an iCalendar string +#dtend(982362522) # Set the value using seconds (time_t) +#dtend() # Return a Time +# +#If the dtend value is being set and duration() has a value, the +#duration property will be removed. +sub dtend{} + +#Sets or returns the value of the duration property. +#Usage: +#duration(dur_obj) # Set the value using a Duration object +#duration("P3DT12H") # Set value as an iCalendar string +#duration(3600) # Set duration using seconds +#duration() # Return a duration +# +#If the duration value is being set and dtend() has a value, the dtend +#property will be removed. +sub duration{} + +#Sets attendees or returns a list of Attendee objects. +sub attendees {} + +#Sets or gets the value of the ORGANIZER property. +#Usage: +#organizer(orgObj) # Set value using an organizer object +#organizer('MAILTO:jd@not.com') # Set value using a CAL-ADDRESS string +#organizer() # Return a CAL-ADDRESS string +sub organizer{} + +#"Sets or gets the SUMMARY value of the Event." +sub summary{} + +#Sets or gets the UID of the Event. +sub uid{} + +#Sets or gets the value for the RECURRENCE-ID property. +#Usage: +#Recurrence_id(recIdObj) # Set using a Recurrence_Id object +#Recurrence_id("19700801T133000") # Set using an iCalendar string +#Recurrence_id(8349873494) # Set using seconds from epoch +#Recurrence_id() # Return a Time +sub recurrence_id{} + +#Sets or gets the SEQUENCE value of the Event. +#Usage: +#sequence(1) # Set the value using an integer +#sequence('2') # Set the value using a string containing an integer +#sequence() # Return an integer +sub sequence{} + +#Sets or returns the value of the LAST-MODIFIED property. +#Usage: +#lastmodified(time_obj) # Set the value using a Time object +#lastmodified('19970101T123000Z')# Set using an iCalendar string +#lastmodified(982362522) # Set using seconds +#lastmodified() # Return a Time +sub lastmodified{} + + + +#Sets or returns the value of the CREATED property. +#Usage: +#created(time_obj) # Set the value using a Time object +#created('19970101T123000Z') # Set using an iCalendar string +#created(982362522) # Set using seconds +#created() # Return a Time +sub created {} + + +sub related_to{} +sub comment{} + +"Sets or returns the value of the DESCRIPTION property." + +sub description {} + +#Sets categories or returns a list of Attendee objects. +sub categories {} + +sub attach{} + +#Represents a set of event occurrences. This +#package controls a component's RRULE, EXRULE, RDATE and EXDATE +#properties and can produce from them a set of occurrences. +package Net::ICal::Libical::RecurrenceSet: + + +#Include a date or rule to the set. +#Use date= or pass in a +#Time instance to include a date. Included dates will add an +#RDATE property or will remove an EXDATE property of the same +#date. +#Use rule= or pass in a string to include a rule. Included +#rules with either add a RRULE property or remove an EXRULE +#property. + +sub include{} + +#Exclude date or rule to the set. +#Use date= or pass in a Time instance to exclude a +#date. Excluded dates will add an EXDATE property or will remove +#an RDATE property of the same date. +#Use rule= or pass in a string to exclude a rule. Excluded +#rules with either add an EXRULE property or remove an RRULE +#property. +sub exclude{} + +#Return 'count' occurrences as a tuple of Time instances. +sub occurrences{} + +package Net::ICal::Libical::Store; +sub new{} +sub path{} +sub mark{} +sub commit{} +sub addComponent{} +sub removeComponent{} +sub countComponents{} +sub select{} +sub clearSelect{} +sub fetch{} +sub fetchMatchK{} +sub modify{} +sub currentComponent{} +sub firstComponent{} +sub nextComponent{} + + +package Net::ICal::Libical::FileStore; +@ISA = (Store) +sub new{} +sub path{} +sub mark{} +sub commit{} +sub addComponent{} +sub removeComponent{} +sub countComponents{} +sub select{} +sub clearSelect{} +sub fetch{} +sub fetchMatchK{} +sub modify{} +sub currentComponent{} +sub firstComponent{} +sub nextComponent{} + + +1; diff --git a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Component.pm b/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Component.pm new file mode 100644 index 0000000000..c25297c111 --- /dev/null +++ b/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Component.pm @@ -0,0 +1,175 @@ +#!/usr/bin/perl +# -*- Mode: perl -*- +#====================================================================== +# FILE: Component.pm +# CREATOR: eric 1 Mar 01 +# +# DESCRIPTION: +# +# +# $Id$ +# $Locker$ +# +# (C) COPYRIGHT 2000, Eric Busboom, eric@softwarestudio.org +# +# This package is free software and is provided "as is" without express +# or implied warranty. It may be used, redistributed and/or modified +# under the same terms as perl itself. ( Either the Artistic License or the +# GPL. ) +# +# +#====================================================================== + + + +package Net::ICal::Libical::Component; +use Net::ICal::Libical; + +use strict; + +sub new{ + my $class = shift; + my $ical_str = shift; # Ical data in string form + my $self = {}; + + $self->{'comp_p'} = Net::ICal::Libical::icalparser_parse_string($ical_str); + + die "Can't parse string into component" if !$self->{'comp_p'}; + + bless $self, $class; +} + +sub new_from_ref { + my $class = shift; + my $r = shift; + my $self = {}; + + $self->{'comp_p'} = $r; + + bless $self, $class; +} + +# Destroy must call icalcomponent_free() if icalcomponent_get_parent() +# returns NULL +sub DESTROY { + my $self = shift; + + my $c = $self->{'comp_p'}; + + if($c && !Net::ICal::Libical::icalcomponent_get_parent($c)){ + Net::ICal::Libical::icalcomponent_free($c); + } + +} + +# Return an array of all properties of the given type +sub properties{ + + my $self = shift; + my $prop_name = shift; + + my @props; + + if(!$prop_name){ + $prop_name = 'ANY'; + } + + # To loop over properties + # $comp_p = $self->{'comp_p'} + # $p = icallangbind_get_first_property($comp_p,$prop_name) + # $p = icallangbind_get_next_property($comp_p,$prop_name) + + my $c = $self->{'comp_p'}; + my $p; + + for($p = Net::ICal::Libical::icallangbind_get_first_property($c,$prop_name); + $p; + $p = Net::ICal::Libical::icallangbind_get_next_property($c,$prop_name)){ + + my $d_string = Net::ICal::Libical::icallangbind_property_eval_string($p,"=>"); + my %dict = %{eval($d_string)}; + + $dict{'ref'} = $p; + + # Now, look at $dict{'value_type'} or $dict{'name'} to construct a + # derived class of Property. I'll do this later. + + my $prop; + + if($dict{'value_type'} eq 'DATE' or $dict{'value_type'} eq 'DATE-TIME'){ + $prop = new Net::ICal::Libical::Time(\%dict); + } elsif($dict{'value_type'} eq 'DURATION' ) { + $prop = new Net::ICal::Libical::Duration(\%dict); + } else { + $prop = new Net::ICal::Libical::Property(\%dict); + } + + push(@props,$prop); + + } + + + return @props; + +} + + +sub add_property { + + # if there is a 'ref' key in the prop's dict, then it is owned by + # an icalcomponent, so dont add it again. But, you may check that + # it is owned by this component with: + # icalproperty_get_parent(p->{'ref'}') != $self->{'comp_p'} + + # If there is no 'ref' key, then create one with $p->{'ref'} = + # icalproperty_new_from_string($p->as_ical_string) + +} + +sub remove_property { + +# If $p->{'ref'} is set, then remove the property with +# icalcomponent_remove_property() } +} + +# Return an array of all components of the given type +sub components { + + my $self = shift; + my $comp_name = shift; + + my @comps; + + if(!$comp_name){ + $comp_name = 'ANY'; + } + + my $c = $self->{'comp_p'}; + my $p; + + for($p = Net::ICal::Libical::icallangbind_get_first_component($c,$comp_name); + $p; + $p = Net::ICal::Libical::icallangbind_get_next_component($c,$comp_name)){ + + push(@comps, Net::ICal::Libical::Component->new_from_ref($p)); + + } + + return @comps; + +} + + +sub add_component {} + +sub remove_component {} + +sub as_ical_string { + my $self = shift; + + return Net::ICal::Libical::icalcomponent_as_ical_string($self->{'comp_p'}) +} + + + +1; diff --git a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Duration.pm b/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Duration.pm new file mode 100644 index 0000000000..13ec9c437e --- /dev/null +++ b/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Duration.pm @@ -0,0 +1,160 @@ +#============================================================================= +# +# This package is free software and is provided "as is" without express +# or implied warranty. It may be used, redistributed and/or modified +# under the same terms as perl itself. (Either the Artistic License or +# the GPL.) +# +#============================================================================= + +=head1 NAME + +Net::ICal::Duration -- represent a length of time + +=head1 SYNOPSIS + + use Net::ICal; + $d = Net::ICal::Duration->new("P3DT6H15M10S"); + $d = Net::ICal::Duration->new(3600); # 1 hour in seconds + +=head1 DESCRIPTION + +I Represents a length of time, such a 3 days, 30 seconds or +7 weeks. You would use this for representing an abstract block of +time; "I want to have a 1-hour meeting sometime." If you want a +calendar- and timezone-specific block of time, see Net::ICal::Period. + +=cut + +#============================================================================= + +package Net::ICal::Libical::Duration; +use Net::ICal::Libical::Property; +use strict; +use Carp; +@Net::ICal::Libical::Duration::ISA = qw ( Net::ICal::Libical::Property ); + +=head1 METHODS + +=head2 new + +Create a new I from: + +=over 4 + +=item * A string in RFC2445 duration format + +=item * An integer representing a number of seconds + +=cut + +sub new { + my $package = shift; + my $arg = shift; + my $self; + + if (ref($arg) == 'HASH'){ + # Construct from dictionary + $self = Net::ICal::Libical::Property::new($package,$arg); + my $val=Net::ICal::Libical::icalproperty_get_value_as_string($self->{'ref'}); + $self->{'dur'} = Net::ICal::Libical::icaldurationtype_from_string($val); + + return $self; + + } elsif ($arg =~ /^[-+]?\d+$/){ + # Seconds + $self = Net::ICal::Libical::Property::new($package,'DURATION'); + $self->{'dur'} = Net::ICal::Libical::icaldurationtype_new_from_int($arg); + } elsif ($arg) { + # iCalendar string + $self = Net::ICal::Libical::Property::new($package,'DURATION'); + $self->{'dur'} = Net::ICal::Libical::icaldurationtype_new_from_string($arg); + } else { + die; + } + + $self->_update_value(); + return $self; + +} + +sub _update_value { + my $self = shift; + + die "Can't find internal icalduration reference" if !$self->{'dur'}; + + $self->value(Net::ICal::Libical::icaldurationtype_as_ical_string($self->{'dur'})); + +} +=head2 clone() + +Return a new copy of the duration. + +=cut + +sub clone { + die "Not Implemented"; + +} + + +=head2 is_valid() + +Determine if this is a valid duration (given criteria TBD). + +=cut + +sub is_valid { + + die "Not Implemented;" + +} + +=head2 seconds() + +Set or Get the length of the duration as seconds. + +=cut + +sub seconds { + my $self = shift; + my $seconds = shift; + + if($seconds){ + $self->{'dur'} = + Net::ICal::Libical::icaldurationtype_from_int($seconds); + $self->_update_value(); + } + + return Net::ICal::Libical::icaldurationtype_as_int($self->{'dur'}); + +} + +=head2 add($duration) + +Return a new duration that is the sum of this and $duration. Does not +modify this object. + +=cut + +sub add { + my ($self, $duration) = @_; + + return new Duration($self->seconds() + $duration->seconds()); +} + + +=head2 subtract($duration) + +Return a new duration that is the difference between this and +$duration. Does not modify this object. + +=cut + +sub subtract { + my ($self, $duration) = @_; + + return new Duration($self->seconds() - $duration->seconds()); +} + +1; diff --git a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Period.pm b/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Period.pm new file mode 100644 index 0000000000..ecf29f3370 --- /dev/null +++ b/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Period.pm @@ -0,0 +1,359 @@ +#!/usr/bin/perl -w +# -*- Mode: perl -*- +#====================================================================== +# +# This package is free software and is provided "as is" without express +# or implied warranty. It may be used, redistributed and/or modified +# under the same terms as perl itself. ( Either the Artistic License or the +# GPL. ) +# +# $Id$ +# +# (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org +# +# $Log +#====================================================================== + + +=pod +=head1 NAME + +Net::ICal::Period -- represent a period of time + +=head1 SYNOPSIS + + use Net::ICal; + $p = new Net::ICal::Period("19970101T120000","19970101T123000"); + $p = new Net::ICal::Period("19970101T120000","PT3W2D40S"); + $p = new Net::ICal::Period(time(),3600); + $p = new Net::ICal::Period( + new Net::ICal::Time("19970101T120000", + "America/Los_Angeles"), + new Net::ICal::Duration("2h")); + +=head1 DESCRIPTION + +Use this to make an object representing a block of time on a +real schedule. You can either say, "This event starts at 12 +and ends at 2" or "This event starts at 12 and lasts 2 hours." + +These two ways of specifying events can be treated differently +in schedules. If you say, "The meeting is from 12 to 2, but I +have to leave at 2," you are implying that the start date and +end date are fixed. If you say, "I have a 2-hour drive to +Chicago, and I need to leave at 4," you are saying that it will +take 2 hours no matter when you leave, and that moving the start +time will slide the end time correspondingly. + +=head1 BASIC METHODS + +=cut + + +#========================================================================= + +package Net::ICal::Period; +use strict; +use Net::ICal::Time; +use Net::ICal::Duration; + +use UNIVERSAL qw(isa); + +#------------------------------------------------------------------------- + +=pod +=head2 new($time, $time|$duration) + +Creates a new period object given to parameters: The first must be a +I