|
, 16:43 |
Sat, 07 Apr, 02:32 |
| <harts...@osafoundation.org> |
<span class="add">+ # changing the rule will delete self unless self is the master
+ master = self.getMaster()
+ if self.recurrenceID == master.startTime:
+ self.deleteAll()
+ else:
+ self.moveRuleEndBefore(self.recurrenceID)
</span><span class="cx">
</span><span class="rem">- def _deleteThisAndFutureModification(self):
- &quot;&quot;&quot;Remove 'thisandfuture' modification and all its occurrences.&quot;&quot;&quot;
</span><span class="add">+ def deleteThis(self):
+ &quot;&quot;&quot;Exclude this occurrence from the recurrence rule.&quot;&quot;&quot;
+ if not getattr(self.rruleset, 'exdates', None):
+ self.rruleset.exdates=[]
+ self.rruleset.exdates.append(self.recurrenceID)
+ del self
+
+ def deleteAll(self):
+ &quot;&quot;&quot;Delete master, all its modifications, occurrences, and rules.&quot;&quot;&quot;
</span><span class="cx"> for event in self.occurrences:
if event == self: #don't delete self quite yet
continue
event._ignoreValueChanges = True
event.delete(recursive=True)
</span><span class="rem">- self.rruleset._ignoreValueChanges = True
- self.rruleset.delete(recursive=True)
</span><span class="add">+ rruleset = self.rruleset
+ rruleset._ignoreValueChanges = True
+ # we don't want rruleset's recursive delete to get self yet
+ del self.rruleset
+ rruleset.delete(recursive=True)
</span><span class="cx"> self._ignoreValueChanges = True
self.delete(recursive=True)
def cleanFuture(self):
&quot;&quot;&quot;Delete all future occurrences and modifications.&quot;&quot;&quot;
</span><span class="rem">-
- def deleteLater(item):
- if datetimeOp(item.startTime, '&gt;', self.startTime):
- item._ignoreValueChanges = True
- item.delete()
-
</span><span class="cx"> master = self.getMaster()
</span><span class="rem">- for mod in master.modifications or []:
- if mod.modifies == 'thisandfuture':
- if datetimeOp(mod.startTime, '&gt;', self.startTime):
- mod._deleteThisAndFutureModification()
- else:
- for event in mod.occurrences or []:
- deleteLater(event)
</span><span class="cx"> for event in master.occurrences:
</span><span class="rem">- deleteLater(event)
</span><span class="add">+ if datetimeOp(event.startTime, '&gt;', self.startTime):
+ event._ignoreValueChanges = True
+ event.delete()
</span><span class="cx">
self._getFirstGeneratedOccurrence(True)
</span><span class="lines">@@ -1011,13 +1013,15 @@
</span><span class="cx"> # A THIS modification to master, make it the new master
self.moveCollections(master, event)
del event.rruleset
</span><span class="rem">- event.recurrenceID = event.startTime
</span><span class="add">+ del event.recurrenceID
</span><span class="cx"> event.modificationFor = None
event.occurrenceFor = event
masterHadModification = True
if masterHadModification:
master.delete()
</span><span class="add">+ else:
+ del master.recurrenceID
</span><span class="cx">
def isCustomRule(self):
</span></pre></div>
<a id="trunkchandlerparcelsosafpimcalendarRecurrencepy"></a>
<div class="modfile"><h4>Modified: trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py (7506 => 7507)</h4>
<pre class="diff">
<span class="info">--- trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py 2005-09-27 23:02:46 UTC (rev 7506)
+++ trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py 2005-09-27 23:54:04 UTC (rev 7507)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx"> value = coerceTimeZone(value, tzinfo)
return value
</span><span class="add">+ # TODO: more comments
</span><span class="cx"> kwargs = dict((k, getattr(self, k, None)) for k in
self.listNames + self.normalNames)
for key in self.specialNames:
</span><span class="lines">@@ -236,8 +237,8 @@
</span><span class="cx"> # Day tuples are (dayOrdinal, n-th week of the month),
# 0 means all weeks
listOfDayTuples=[(day, 0) for day in rrule._byweekday]
</span><span class="rem">- if rrule._bynweekday:
- listOfDayTuples.extend(tup for tup in rrule._bynweekday)
</span><span class="add">+ if rrule._bynweekday is not None:
+ listOfDayTuples.extend(rrule._bynweekday)
</span><span class="cx"> if len(listOfDayTuples) &gt; 0:
self.byweekday = []
for day, n in listOfDayTuples:
</span><span class="lines">@@ -257,10 +258,11 @@
</span><span class="cx"> self.until = coerceTimeZone(until, ICUtzinfo.getDefault())
for key in self.listNames:
</span><span class="add">+ # TODO: cache getattr(rrule, '_' + key)
</span><span class="cx"> if getattr(rrule, '_' + key) is not None and \
(key not in self.interpretedNames or \
len(getattr(rrule, '_' + key)) &gt; 1):
</span><span class="rem">- # cast tuples to list, or will the repository do this for us?
</span><span class="add">+ # cast tuples to list
</span><span class="cx"> setattr(self, key, list(getattr(rrule, '_' + key)))
# bymonthday and bymonth may be set automatically by dateutil, if so,
# unset them
</span><span class="lines">@@ -274,7 +276,6 @@
</span><span class="cx"> del self.bymonth
</span><span class="rem">-
</span><span class="cx"> def onValueChanged(self, name):
&quot;&quot;&quot;If the rule changes, update any associated events.&quot;&quot;&quot;
if name in self.listNames + self.normalNames + self.specialNames:
</span><span class="lines">@@ -317,9 +318,10 @@
</span><span class="cx">
def addRule(self, rule, rruleorexrule='rrule'):
&quot;&quot;&quot;Add an rrule or exrule, defaults to rrule.&quot;&quot;&quot;
</span><span class="rem">- rulelist = getattr(self, rruleorexrule + 's', [])
- rulelist.append(rule)
- setattr(self, rruleorexrule + 's', rulelist)
</span><span class="add">+ try:
+ getattr(self, rruleorexrule + 's').append(rule)
+ except AttributeError:
+ setattr(self, rruleorexrule + 's', [rule])
</span><span class="cx">
def createDateUtilFromRule(self, dtstart):
&quot;&quot;&quot;Return an appropriate dateutil.rrule.rruleset.&quot;&quot;&quot;
</span><span class="lines">@@ -377,9 +379,11 @@
</span><span class="cx"> rule = list(self.rrules)[0]
if rulore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.sln.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.sln.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.cpp?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.sln?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
Index: internal/launchers/win/winlaunch/.cvsignore
diff -u /dev/null internal/launchers/win/winlaunch/.cvsignore:1.3
--- /dev/null Mon Jul 26 11:33:47 2004
+++ internal/launchers/win/winlaunch/.cvsignore Mon Jul 26 11:33:44 2004
@@ -0,0 +1,2 @@
+Debug
+Release
Index: internal/launchers/win/Makefile
diff -u internal/launchers/win/Makefile:1.7 internal/launchers/win/Makefile:1.8
--- internal/launchers/win/Makefile:1.7 Tue Jul 20 15:02:33 2004
+++ internal/launchers/win/Makefile Mon Jul 26 11:33:44 2004
@@ -6,30 +6,30 @@
DLLS=$(DLLS_DIR)/msvcp71d.dll $(DLLS_DIR)/msvcr71d.dll $(DLLS_DIR)/msvcrtd.dll
-build: winlaunch2/chandlerDebug.exe winlaunch1/chandler.exe
+build: winlaunch/chandlerDebug.exe winlaunch_bin/chandler.exe
-winlaunch2/chandlerDebug.exe: winlaunch2/winlaunch2.cpp
- devenv.com winlaunch2/winlaunch2.sln /build $(SNAP)
- cp winlaunch2/$(Snap)/chandlerDebug.exe $(BUILD_ROOT)
-
-winlaunch1/chandler.exe: winlaunch1/winlaunch1.cpp
- devenv.com winlaunch1/winlaunch1.sln /build $(SNAP)
- cp winlaunch1/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
+winlaunch/chandlerDebug.exe: winlaunch/winlaunch.cpp
+ devenv.com winlaunch/winlaunch.sln /build $(SNAP)
+ cp winlaunch/$(Snap)/chandlerDebug.exe $(BUILD_ROOT)
+
+winlaunch_bin/chandler.exe: winlaunch_bin/winlaunch_bin.cpp
+ devenv.com winlaunch_bin/winlaunch_bin.sln /build $(SNAP)
+ cp winlaunch_bin/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
cp $(DLLS) $(BUILD_ROOT)/$(SNAP)/bin
else
DLLS=$(DLLS_DIR)/msvcp71.dll $(DLLS_DIR)/msvcr71.dll
-build: winlaunch2/chandler.exe winlaunch1/chandler.exe
+build: winlaunch/chandler.exe winlaunch_bin/chandler.exe
-winlaunch2/chandler.exe: winlaunch2/winlaunch2.cpp
- devenv.com winlaunch2/winlaunch2.sln /build $(SNAP)
- cp winlaunch2/$(Snap)/chandler.exe $(BUILD_ROOT)
-
-winlaunch1/chandler.exe: winlaunch1/winlaunch1.cpp
- devenv.com winlaunch1/winlaunch1.sln /build $(SNAP)
- cp winlaunch1/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
+winlaunch/chandler.exe: winlaunch/winlaunch.cpp
+ devenv.com winlaunch/winlaunch.sln /build $(SNAP)
+ cp winlaunch/$(Snap)/chandler.exe $(BUILD_ROOT)
+
+winlaunch_bin/chandler.exe: winlaunch_bin/winlaunch_bin.cpp
+ devenv.com winlaunch_bin/winlaunch_bin.sln /build $(SNAP)
+ cp winlaunch_bin/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
cp $(DLLS) $(BUILD_ROOT)/$(SNAP)/bin
clean:
Index: internal/launchers/win/winlaunch/winlaunch.vcproj
diff -u /dev/null internal/launchers/win/winlaunch/winlaunch.vcproj:1.8
--- /dev/null Mon Jul 26 11:33:47 2004
+++ internal/launchers/win/winlaunch/winlaunch.vcproj Mon Jul 26 11:33:44 2004
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="winlaunch"
+ ProjectGUID="{90AD6487-6195-4CEB-A81F-DD83DDB6B96C}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/chandlerDebug.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/winlaunch.pdb"
+ SubSystem="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(OutDir)\chandlerDebug.exe $(ProjectDir)..\..\..\..\chandler\chandlerDebug.exe"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/chandler.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(OutDir)\chandler.exe $(ProjectDir)..\..\..\..\chandler\chandler.exe"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ 407062223.i66MNVZb028907@localhost.localdomain> |
Sun, 12 Apr, 21:12 |
| <harts...@osafoundation.org> |
<span class="add">+ # changing the rule will delete self unless self is the master
+ master = self.getMaster()
+ if self.recurrenceID == master.startTime:
+ self.deleteAll()
+ else:
+ self.moveRuleEndBefore(self.recurrenceID)
</span><span class="cx">
</span><span class="rem">- def _deleteThisAndFutureModification(self):
- &quot;&quot;&quot;Remove 'thisandfuture' modification and all its occurrences.&quot;&quot;&quot;
</span><span class="add">+ def deleteThis(self):
+ &quot;&quot;&quot;Exclude this occurrence from the recurrence rule.&quot;&quot;&quot;
+ if not getattr(self.rruleset, 'exdates', None):
+ self.rruleset.exdates=[]
+ self.rruleset.exdates.append(self.recurrenceID)
+ del self
+
+ def deleteAll(self):
+ &quot;&quot;&quot;Delete master, all its modifications, occurrences, and rules.&quot;&quot;&quot;
</span><span class="cx"> for event in self.occurrences:
if event == self: #don't delete self quite yet
continue
event._ignoreValueChanges = True
event.delete(recursive=True)
</span><span class="rem">- self.rruleset._ignoreValueChanges = True
- self.rruleset.delete(recursive=True)
</span><span class="add">+ rruleset = self.rruleset
+ rruleset._ignoreValueChanges = True
+ # we don't want rruleset's recursive delete to get self yet
+ del self.rruleset
+ rruleset.delete(recursive=True)
</span><span class="cx"> self._ignoreValueChanges = True
self.delete(recursive=True)
def cleanFuture(self):
&quot;&quot;&quot;Delete all future occurrences and modifications.&quot;&quot;&quot;
</span><span class="rem">-
- def deleteLater(item):
- if datetimeOp(item.startTime, '&gt;', self.startTime):
- item._ignoreValueChanges = True
- item.delete()
-
</span><span class="cx"> master = self.getMaster()
</span><span class="rem">- for mod in master.modifications or []:
- if mod.modifies == 'thisandfuture':
- if datetimeOp(mod.startTime, '&gt;', self.startTime):
- mod._deleteThisAndFutureModification()
- else:
- for event in mod.occurrences or []:
- deleteLater(event)
</span><span class="cx"> for event in master.occurrences:
</span><span class="rem">- deleteLater(event)
</span><span class="add">+ if datetimeOp(event.startTime, '&gt;', self.startTime):
+ event._ignoreValueChanges = True
+ event.delete()
</span><span class="cx">
self._getFirstGeneratedOccurrence(True)
</span><span class="lines">@@ -1011,13 +1013,15 @@
</span><span class="cx"> # A THIS modification to master, make it the new master
self.moveCollections(master, event)
del event.rruleset
</span><span class="rem">- event.recurrenceID = event.startTime
</span><span class="add">+ del event.recurrenceID
</span><span class="cx"> event.modificationFor = None
event.occurrenceFor = event
masterHadModification = True
if masterHadModification:
master.delete()
</span><span class="add">+ else:
+ del master.recurrenceID
</span><span class="cx">
def isCustomRule(self):
</span></pre></div>
<a id="trunkchandlerparcelsosafpimcalendarRecurrencepy"></a>
<div class="modfile"><h4>Modified: trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py (7506 => 7507)</h4>
<pre class="diff">
<span class="info">--- trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py 2005-09-27 23:02:46 UTC (rev 7506)
+++ trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py 2005-09-27 23:54:04 UTC (rev 7507)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx"> value = coerceTimeZone(value, tzinfo)
return value
</span><span class="add">+ # TODO: more comments
</span><span class="cx"> kwargs = dict((k, getattr(self, k, None)) for k in
self.listNames + self.normalNames)
for key in self.specialNames:
</span><span class="lines">@@ -236,8 +237,8 @@
</span><span class="cx"> # Day tuples are (dayOrdinal, n-th week of the month),
# 0 means all weeks
listOfDayTuples=[(day, 0) for day in rrule._byweekday]
</span><span class="rem">- if rrule._bynweekday:
- listOfDayTuples.extend(tup for tup in rrule._bynweekday)
</span><span class="add">+ if rrule._bynweekday is not None:
+ listOfDayTuples.extend(rrule._bynweekday)
</span><span class="cx"> if len(listOfDayTuples) &gt; 0:
self.byweekday = []
for day, n in listOfDayTuples:
</span><span class="lines">@@ -257,10 +258,11 @@
</span><span class="cx"> self.until = coerceTimeZone(until, ICUtzinfo.getDefault())
for key in self.listNames:
</span><span class="add">+ # TODO: cache getattr(rrule, '_' + key)
</span><span class="cx"> if getattr(rrule, '_' + key) is not None and \
(key not in self.interpretedNames or \
len(getattr(rrule, '_' + key)) &gt; 1):
</span><span class="rem">- # cast tuples to list, or will the repository do this for us?
</span><span class="add">+ # cast tuples to list
</span><span class="cx"> setattr(self, key, list(getattr(rrule, '_' + key)))
# bymonthday and bymonth may be set automatically by dateutil, if so,
# unset them
</span><span class="lines">@@ -274,7 +276,6 @@
</span><span class="cx"> del self.bymonth
</span><span class="rem">-
</span><span class="cx"> def onValueChanged(self, name):
&quot;&quot;&quot;If the rule changes, update any associated events.&quot;&quot;&quot;
if name in self.listNames + self.normalNames + self.specialNames:
</span><span class="lines">@@ -317,9 +318,10 @@
</span><span class="cx">
def addRule(self, rule, rruleorexrule='rrule'):
&quot;&quot;&quot;Add an rrule or exrule, defaults to rrule.&quot;&quot;&quot;
</span><span class="rem">- rulelist = getattr(self, rruleorexrule + 's', [])
- rulelist.append(rule)
- setattr(self, rruleorexrule + 's', rulelist)
</span><span class="add">+ try:
+ getattr(self, rruleorexrule + 's').append(rule)
+ except AttributeError:
+ setattr(self, rruleorexrule + 's', [rule])
</span><span class="cx">
def createDateUtilFromRule(self, dtstart):
&quot;&quot;&quot;Return an appropriate dateutil.rrule.rruleset.&quot;&quot;&quot;
</span><span class="lines">@@ -377,9 +379,11 @@
</span><span class="cx"> rule = list(self.rrules)[0]
if rulore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.sln.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.sln.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.cpp?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.sln?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
Index: internal/launchers/win/winlaunch/.cvsignore
diff -u /dev/null internal/launchers/win/winlaunch/.cvsignore:1.3
--- /dev/null Mon Jul 26 11:33:47 2004
+++ internal/launchers/win/winlaunch/.cvsignore Mon Jul 26 11:33:44 2004
@@ -0,0 +1,2 @@
+Debug
+Release
Index: internal/launchers/win/Makefile
diff -u internal/launchers/win/Makefile:1.7 internal/launchers/win/Makefile:1.8
--- internal/launchers/win/Makefile:1.7 Tue Jul 20 15:02:33 2004
+++ internal/launchers/win/Makefile Mon Jul 26 11:33:44 2004
@@ -6,30 +6,30 @@
DLLS=$(DLLS_DIR)/msvcp71d.dll $(DLLS_DIR)/msvcr71d.dll $(DLLS_DIR)/msvcrtd.dll
-build: winlaunch2/chandlerDebug.exe winlaunch1/chandler.exe
+build: winlaunch/chandlerDebug.exe winlaunch_bin/chandler.exe
-winlaunch2/chandlerDebug.exe: winlaunch2/winlaunch2.cpp
- devenv.com winlaunch2/winlaunch2.sln /build $(SNAP)
- cp winlaunch2/$(Snap)/chandlerDebug.exe $(BUILD_ROOT)
-
-winlaunch1/chandler.exe: winlaunch1/winlaunch1.cpp
- devenv.com winlaunch1/winlaunch1.sln /build $(SNAP)
- cp winlaunch1/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
+winlaunch/chandlerDebug.exe: winlaunch/winlaunch.cpp
+ devenv.com winlaunch/winlaunch.sln /build $(SNAP)
+ cp winlaunch/$(Snap)/chandlerDebug.exe $(BUILD_ROOT)
+
+winlaunch_bin/chandler.exe: winlaunch_bin/winlaunch_bin.cpp
+ devenv.com winlaunch_bin/winlaunch_bin.sln /build $(SNAP)
+ cp winlaunch_bin/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
cp $(DLLS) $(BUILD_ROOT)/$(SNAP)/bin
else
DLLS=$(DLLS_DIR)/msvcp71.dll $(DLLS_DIR)/msvcr71.dll
-build: winlaunch2/chandler.exe winlaunch1/chandler.exe
+build: winlaunch/chandler.exe winlaunch_bin/chandler.exe
-winlaunch2/chandler.exe: winlaunch2/winlaunch2.cpp
- devenv.com winlaunch2/winlaunch2.sln /build $(SNAP)
- cp winlaunch2/$(Snap)/chandler.exe $(BUILD_ROOT)
-
-winlaunch1/chandler.exe: winlaunch1/winlaunch1.cpp
- devenv.com winlaunch1/winlaunch1.sln /build $(SNAP)
- cp winlaunch1/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
+winlaunch/chandler.exe: winlaunch/winlaunch.cpp
+ devenv.com winlaunch/winlaunch.sln /build $(SNAP)
+ cp winlaunch/$(Snap)/chandler.exe $(BUILD_ROOT)
+
+winlaunch_bin/chandler.exe: winlaunch_bin/winlaunch_bin.cpp
+ devenv.com winlaunch_bin/winlaunch_bin.sln /build $(SNAP)
+ cp winlaunch_bin/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
cp $(DLLS) $(BUILD_ROOT)/$(SNAP)/bin
clean:
Index: internal/launchers/win/winlaunch/winlaunch.vcproj
diff -u /dev/null internal/launchers/win/winlaunch/winlaunch.vcproj:1.8
--- /dev/null Mon Jul 26 11:33:47 2004
+++ internal/launchers/win/winlaunch/winlaunch.vcproj Mon Jul 26 11:33:44 2004
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="winlaunch"
+ ProjectGUID="{90AD6487-6195-4CEB-A81F-DD83DDB6B96C}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/chandlerDebug.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/winlaunch.pdb"
+ SubSystem="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(OutDir)\chandlerDebug.exe $(ProjectDir)..\..\..\..\chandler\chandlerDebug.exe"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/chandler.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(OutDir)\chandler.exe $(ProjectDir)..\..\..\..\chandler\chandler.exe"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ letelt;Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\winlaunch.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
y get added to the sidebar |
Sun, 12 Apr, 21:12 |
| <harts...@osafoundation.org> |
[No Subject] |
Sun, 12 Apr, 21:12 |
| <harts...@osafoundation.org> |
[No Subject] |
Sun, 12 Apr, 21:12 |
| <harts...@osafoundation.org> |
[No Subject] |
Sun, 12 Apr, 21:12 |
| <harts...@osafoundation.org> |
[No Subject] |
Sun, 12 Apr, 21:12 |
| <harts...@osafoundation.org> |
[No Subject] |
Sun, 12 Apr, 21:12 |
| <harts...@osafoundation.org> |
[No Subject] |
Sun, 12 Apr, 21:12 |
| <harts...@osafoundation.org> |
[No Subject] |
Sun, 12 Apr, 21:12 |
| <harts...@osafoundation.org> |
[No Subject] |
Sun, 12 Apr, 21:12 |
| <harts...@osafoundation.org> |
[No Subject] |
Sun, 12 Apr, 21:12 |
| <mor...@osafoundation.org> |
[No Subject] |
Sun, 18 Nov, 07:51 |
| Parlante |
vajda) released UUIDext 0.3-2 |
Sat, 09 Apr, 03:30 |
| Parlante |
vajda) released UUIDext 0.3-2 |
Sat, 09 Apr, 03:30 |
| Parlante |
vajda) released UUIDext 0.3-2 |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| Parlante |
[No Subject] |
Sat, 09 Apr, 03:30 |
| b...@code-bear.com |
[No Subject] |
Sat, 13 Sep, 09:29 |
| dation.org |
ts@Fri, 09 Jul, 19:57 |
Tue, 30 Dec, 20:17 |
| dation.org |
ts@Fri, 09 Jul, 19:57 |
Tue, 30 Dec, 20:17 |
| e |
self.startTime
</span><span class="rem">- # this kludge should be replaced with the new domain attribute aspect
-## elif name not in &quot;&quot;&quot;modifications modificationFor occurrences
-## occurrenceFor modifies isGenerated recurrenceID
-## _ignoreValueChanges modificationRecurrenceID queries
-## contentsOwner TPBSelectedItemOwner TPBDetailItemOwner
-## itemCollectionInclusions
-## &quot;&quot;&quot;.split():
- # this won't work with stamping, temporary solution to allow testing
</span><span class="add">+ # the changeName kludge should be replaced with the new domain attribute
+ # aspect, just using a fixed list of attributes which should trigger
+ # changeThis won't work with stamping
</span><span class="cx"> elif changeName:
if DEBUG:
logger.debug(&quot;about to changeThis in onValueChanged(name=%s) for %s&quot;, name, str(self))
</span><span class="lines">@@ -946,54 +947,55 @@
</span><span class="cx"> first = self.getFirstInRule()
self._deleteGeneratedOccurrences()
if first.hasLocalAttributeValue('modifications'):
</span><span class="add">+ until = first.rruleset.rrules.first().calculatedUntil()
</span><span class="cx"> for mod in first.modifications:
</span><span class="rem">- if mod.modifies == 'this':
- # this won't work for complicated rrulesets
- until = first.rruleset.rrules.first().calculatedUntil()
- if until is not None \
- and datetimeOp(mod.recurrenceID, '&gt;', until) \
- and mod != first:
- mod._ignoreValueChanges = True
- mod.delete()
</span><span class="add">+ # this won't work for complicated rrulesets
+ if until != None and datetimeOp(mod.recurrenceID, '&gt;', until):
+ mod._ignoreValueChanges = True
+ mod.delete()
</span><span class="cx">
# create a backup
first._getFirstGeneratedOccurrence(True)
</span><span class="rem">- def removeFuture(self):
</span><span class="add">+ def deleteFuture(self):
</span><span class="cx"> &quot;&quot;&quot;Delete self and all future occurrences and modifications.&quot;&quot;&quot;
</span><span class="rem">- pass
</span><span class="add">+ # changing the rule will delete self unless self is the master
+ master = self.getMaster()
+ if self.recurrenceID == master.startTime:
+ self.deleteAll()
+ else:
+ self.moveRuleEndBefore(self.recurrenceID)
</span><span class="cx">
</span><span class="rem">- def _deleteThisAndFutureModification(self):
- &quot;&quot;&quot;Remove 'thisandfuture' modification and all its occurrences.&quot;&quot;&quot;
</span><span class="add">+ def deleteThis(self):
+ &quot;&quot;&quot;Exclude this occurrence from the recurrence rule.&quot;&quot;&quot;
+ if not getattr(self.rruleset, 'exdates', None):
+ self.rruleset.exdates=[]
+ self.rruleset.exdates.append(self.recurrenceID)
+ del self
+
+ def deleteAll(self):
+ &quot;&quot;&quot;Delete master, all its modifications, occurrences, and rules.&quot;&quot;&quot;
</span><span class="cx"> for event in self.occurrences:
if event == self: #don't delete self quite yet
continue
event._ignoreValueChanges = True
event.delete(recursive=True)
</span><span class="rem">- self.rruleset._ignoreValueChanges = True
- self.rruleset.delete(recursive=True)
</span><span class="add">+ rruleset = self.rruleset
+ rruleset._ignoreValueChanges = True
+ # we don't want rruleset's recursive delete to get self yet
+ del self.rruleset
+ rruleset.delete(recursive=True)
</span><span class="cx"> self._ignoreValueChanges = True
self.delete(recursive=True)
def cleanFuture(self):
&quot;&quot;&quot;Delete all future occurrences and modifications.&quot;&quot;&quot;
</span><span class="rem">-
- def deleteLater(item):
- if datetimeOp(item.startTime, '&gt;', self.startTime):
- item._ignoreValueChanges = True
- item.delete()
-
</span><span class="cx"> master = self.getMaster()
</span><span class="rem">- for mod in master.modifications or []:
- if mod.modifies == 'thisandfuture':
- if datetimeOp(mod.startTime, '&gt;', self.startTime):
- mod._deleteThisAndFutureModification()
- else:
- for event in mod.occurrences or []:
- deleteLater(event)
</span><span class="cx"> for event in master.occurrences:
</span><span class="rem">- deleteLater(event)
</span><span class="add">+ if datetimeOp(event.startTime, '&gt;', self.startTime):
+ event._ignoreValueChanges = True
+ event.delete()
</span><span class="cx">
self._getFirstGeneratedOccurrence(True)
</span><span class="lines">@@ -1011,13 +1013,15 @@
</span><span class="cx"> # A THIS modification to master, make it the new master
self.moveCollections(master, event)
del event.rruleset
</span><span class="rem">- event.recurrenceID = event.startTime
</span><span class="add">+ del event.recurrenceID
</span><span class="cx"> event.modificationFor = None
event.occurrenceFor = event
masterHadModification = True
if masterHadModification:
master.delete()
</span><span class="add">+ else:
+ del master.recurrenceID
</span><span class="cx">
def isCustomRule(self):
</span></pre></div>
<a id="trunkchandlerparcelsosafpimcalendarRecurrencepy"></a>
<div class="modfile"><h4>Modified: trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py (7506 => 7507)</h4>
<pre class="diff">
<span class="info">--- trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py 2005-09-27 23:02:46 UTC (rev 7506)
+++ trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py 2005-09-27 23:54:04 UTC (rev 7507)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx"> value = coerceTimeZone(value, tzinfo)
return value
</span><span class="add">+ # TODO: more comments
</span><span class="cx"> kwargs = dict((k, getattr(self, k, None)) for k in
self.listNames + self.normalNames)
for key in self.specialNames:
</span><span class="lines">@@ -236,8 +237,8 @@
</span><span class="cx"> # Day tuples are (dayOrdinal, n-th week of the month),
# 0 means all weeks
listOfDayTuples=[(day, 0) for day in rrule._byweekday]
</span><span class="rem">- if rrule._bynweekday:
- listOfDayTuples.extend(tup for tup in rrule._bynweekday)
</span><span class="add">+ def createDateUtilFromRule(self, dtstart):
&quot;&quot;&quot;Return an appropriate dateutil.rrule.rruleset.&quot;&quot;&quot;
</span><span class="lines">@@ -377,9 +379,11 @@
</span><span class="cx"> rule = list(self.rrules)[0]
if rule.interval != 1:
return True
</span><span class="rem">- for attr in RecurrenceRule.listNames+(&quot;byweekday&quot;,):
</span><span class="add">+ for attr in RecurrenceRule.listNames:
</span><span class="cx"> if getattr(rule, attr):
return True
</span><span class="add">+ if rule.byweekday:
+ return True
</span><span class="cx"> return False
def getCustomDescription(self):
</span></pre></div>
<a id="trunkchandlerparcelsosafpimcalendartestsTestRecurringEventpy"></a>
<div class="modfile"><h4>Modified: trunk/chandler/parcels/osaf/pim/calendar/tests/TestRecurringEvent.py (7506 => 7507)</h4>
<pre class="diff">
<span class="info">--- trunk/chandler/parcels/osaf/pim/calendar/tests/TestRecurringEvent.py 2005-09-27 23:02:46 UTC (rev 7506)
+++ trunk/chandler/parcels/osaf/pim/calendar/tests/TestRecurringEvent.py 2005-09-27 23:54:04 UTC (rev 7507)
</span><span class="lines">@@ -290,6 +290,9 @@
</span><span class="cx"> self.assertEqual(len(list(third.occurrences)), 3)
self.assertEqual(fourth.recurrenceID,
fourth.startTime + timedelta(hours=1))
</span><span class="add">+ self.assertEqual(third.rruleset, fourth.rruleset)
+ self.assertEqual(third.icalUID, fourth.icalUID)
+ self.assertNotEqual(second.icalUID, third.icalUID)
</span><span class="cx">
# make sure second's rruleset was updated
self.assert_(list(second.rruleset.rrules)[0].until &lt; thirdChangedStart)
</span><span class="lines">@@ -413,7 +416,13 @@
</span><span class="cx"> self.assertNotEqual(self.event.icalUID, second.icalUID)
self.assertEqual(second.icalUID, third.icalUID)
self.assertEqual(third.modificationFor, second.occurrenceFor)
</span><span class="rem">-
</span><span class="add">+
+ def testRdatesAndExdates(self):
+ pass
+
+ def testDelete(self):
+ pass
+
</span><span class="cx"> def testNeverEndingEvents(self):
ruleItem = RecurrenceRule(None, view=self.rep.view)
ruleItem.freq = 'daily'
</span></pre></div>
<a id="trunkchandlerparcelsosafsharingICalendarpy"></a>
<div class="modfile"><h4>Modified: trunk/chandler/parcels/osaf/sharing/ICalendar.py (7506 => 7507)</h4>
<pre class="diff">
<span class="info">--- trunk/chandler/parcels/osaf/sharing/ICalendar.py 2005-09-27 23:02:46 UTC (rev 7506)
+++ trunk/chandler/parcels/osaf/sharing/ICalendar.py 2005-09-27 23:54:04 UTC (rev 7507)
</span><span class="lines">@@ -318,6 +318,8 @@
</span><span class="cx"> if not isinstance(item, AbstractCollection):
print &quot;Only a share or an item collection can be passed in&quot;
#@@@MOR Raise something
</span><span class="add">+ else:
+ caldavReturn = None
</span><span class="cx">
input = StringIO.StringIO(text)
calendar = vobject.readComponents(input, validate=True).next()
</span><span class="lines">@@ -452,13 +454,20 @@
</span><span class="cx"> continue
else:
eventItem = uidMatchItem
</span><span class="add">+ if (eventItem.occurrenceFor is None and
+ eventItem.occurrences is None):
+ eventItem.occurrenceFor = eventItem
+ if eventItem.rruleset is not None:
+ # re-creating a recurring item from scratch, delete
+ # old recurrence information
+ eventItem.removeRecurrence()
+
</span><span class="cx"> countUpdated += 1
else:
eventItem = pickKind.newItem(None, newItemParent)
countNew += 1
</span><span class="rem">- eventItem.icalUID = event.uid[0].value
</span><span class="add">+ eventItem.icalUID = event.uid[0].value
</span><span class="cx">
</span><span class="rem">-
</span><span class="cx"> # vobject isn't meshing well with dateutil when dtstart isDate;
# dtstart is converted to a datetime for dateutil, but rdate
# isn't. To make dateutil happy, convert rdates which are dates to
</span><span class="lines">@@ -520,7 +529,7 @@
</span><span class="cx"> if self.fileStyle() == self.STYLE_SINGLE:
item.add(eventItem.getMaster())
else:
</span><span class="rem">- return eventItem
</span><span class="add">+ caldavReturn = eventItem.getMaster()
</span><span class="cx"> except Exception, e:
if __debug__:
raise e
</span><span class="lines">@@ -531,8 +540,12 @@
</span><span class="cx"> logger.info(&quot;...iCalendar import of %d new items, %d updated&quot; % \
(countNew, countUpdated))
</span><span class="rem">- return item
</span><span class="add">+ if self.fileStyle() == self.STYLE_SINGLE:
+ return item
+ else:
+ return caldavReturn
</span><span class="cx">
</span><span class="add">+
</span><span class="cx"> def exportProcess(self, share, depth=0):
cal = itemsToVObject(self.itsView, share.contents,
filters=self.share.filterAttributes)
</span>
</pre>
</div>
</div>
</body>
</html>
% |
Tue, 18 Feb, 17:56 |
| e |
[No Subject] |
Tue, 18 Feb, 17:56 |
| ia |
[No Subject] |
Mon, 26 May, 09:29 |
| ia |
[No Subject] |
Mon, 26 May, 09:29 |
| ia |
[No Subject] |
Mon, 26 May, 09:29 |
| ia |
[No Subject] |
Mon, 26 May, 09:29 |
| ia |
[No Subject] |
Mon, 26 May, 09:29 |
| ia |
[No Subject] |
Mon, 26 May, 09:29 |
| is |
_ignoreValueChanges = True
- mod.delete()
</span><span class="add">+ # this won't work for complicated rrulesets
+ if until != None and datetimeOp(mod.recurrenceID, '&gt;', until):
+ mod._ignoreValueChanges = True
+ mod.delete()
</span><span class="cx">
# create a backup
first._getFirstGeneratedOccurrence(True)
</span><span class="rem">- def removeFuture(self):
</span><span class="add">+ def deleteFuture(self):
</span><span class="cx"> &quot;&quot;&quot;Delete self and all future occurrences and modifications.&quot;&quot;&quot;
</span><span class="rem">- pass
</span><span class="add">+ # changing the rule will delete self unless self is the master
+ master = self.getMaster()
+ if self.recurrenceID == master.startTime:
+ self.deleteAll()
+ else:
+ self.moveRuleEndBefore(self.recurrenceID)
</span><span class="cx">
</span><span class="rem">- def _deleteThisAndFutureModification(self):
- &quot;&quot;&quot;Remove 'thisandfuture' modification and all its occurrences.&quot;&quot;&quot;
</span><span class="add">+ def deleteThis(self):
+ &quot;&quot;&quot;Exclude this occurrence from the recurrence rule.&quot;&quot;&quot;
+ if not getattr(self.rruleset, 'exdates', None):
+ self.rruleset.exdates=[]
+ self.rruleset.exdates.append(self.recurrenceID)
+ del self
+
+ def deleteAll(self):
+ &quot;&quot;&quot;Delete master, all its modifications, occurrences, and rules.&quot;&quot;&quot;
</span><span class="cx"> for event in self.occurrences:
if event == self: #don't delete self quite yet
continue
event._ignoreValueChanges = True
event.delete(recursive=True)
</span><span class="rem">- self.rruleset._ignoreValueChanges = True
- self.rruleset.delete(recursive=True)
</span><span class="add">+ rruleset = self.rruleset
+ rruleset._ignoreValueChanges = True
+ # we don't want rruleset's recursive delete to get self yet
+ del self.rruleset
+ rruleset.delete(recursive=True)
</span><span class="cx"> self._ignoreValueChanges = True
self.delete(recursive=True)
def cleanFuture(self):
&quot;&quot;&quot;Delete all future occurrences and modifications.&quot;&quot;&quot;
</span><span class="rem">-
- def deleteLater(item):
- if datetimeOp(item.startTime, '&gt;', self.startTime):
- item._ignoreValueChanges = True
- item.delete()
-
</span><span class="cx"> master = self.getMaster()
</span><span class="rem">- for mod in master.modifications or []:
- if mod.modifies == 'thisandfuture':
- if datetimeOp(mod.startTime, '&gt;', self.startTime):
- mod._deleteThisAndFutureModification()
- else:
- for event in mod.occurrences or []:
- deleteLater(event)
</span><span class="cx"> for event in master.occurrences:
</span><span class="rem">- deleteLater(event)
</span><span class="add">+ if datetimeOp(event.startTime, '&gt;', self.startTime):
+ event._ignoreValueChanges = True
+ event.delete()
</span><span class="cx">
self._getFirstGeneratedOccurrence(True)
</span><span class="lines">@@ -1011,13 +1013,15 @@
</span><span class="cx"> # A THIS modification to master, make it the new master
self.moveCollections(master, event)
del event.rruleset
</span><span class="rem">- event.recurrenceID = event.startTime
</span><span class="add">+ del event.recurrenceID
</span><span class="cx"> event.modificationFor = None
event.occurrenceFor = event
masterHadModification = True
if masterHadModification:
master.delete()
</span><span class="add">+ else:
+ del master.recurrenceID
</span><span class="cx">
def isCustomRule(self):
</span></pre></div>
<a id="trunkchandlerparcelsosafpimcalendarRecurrencepy"></a>
<div class="modfile"><h4>Modified: trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py (7506 => 7507)</h4>
<pre class="diff">
<span class="info">--- trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py 2005-09-27 23:02:46 UTC (rev 7506)
+++ trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py 2005-09-27 23:54:04 UTC (rev 7507)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx"> value = coerceTimeZone(value, tzinfo)
return value
</span><span class="add">+ # TODO: more comments
</span><span class="cx"> kwargs = dict((k, getattr(self, k, None)) for k in
self.listNames + self.normalNames)
for key in self.specialNames:
</span><span class="lines">@@ -236,8 +237,8 @@
</span><span class="cx"> # Day tuples are (dayOrdinal, n-th week of the month),
# 0 means all weeks
listOfDayTuples=[(day, 0) for day in rrule._byweekday]
</span><span class="rem">- if rrule._bynweekday:
- listOfDayTuples.extend(tup for tup in rrule._bynweekday)
</span><span class="add">+ if rrule._bynweekday is not None:
+ listOfDayTuples.extend(rrule._bynweekday)
</span><span class="cx"> if len(listOfDayTuples) &gt; 0:
self.byweekday = []
for day, n in listOfDayTuples:
</span><span class="lines">@@ -257,10 +258,11 @@
</span><span class="cx"> self.until = coerceTimeZone(until, ICUtzinfo.getDefault())
for key in self.listNames:
</span><span class="add">+ # TODO: cache getattr(rrule, '_' + key)
</span><span class="cx"> if getattr(rrule, '_' + key) is not None and \
(key not in self.interpretedNames or \
len(getattr(rrule, '_' + key)) &gt; 1):
</span><span class="rem">- # cast tuples to list, or will the repository do this for us?
</span><span class="add">+ # cast tuples to list
</span><span class="cx"> setattr(self, key, list(getattr(rrule, '_' + key)))
# bymonthday and bymonth may be set automatically by dateutil, if so,
# unset them
</span><span class="lines">@@ -274,7 +276,6 @@
</span><span class="cx"> del self.bymonth
</span><span class="rem">-
</span><span class="cx"> def onValueChanged(self, name):
&quot;&quot;&quot;If the rule changes, update any associated events.&quot;&quot;&quot;
if name in self.listNames + self.normalNames + self.specialNames:
</span><span class="lines">@@ -317,9 +318,10 @@
</span><span class="cx">
def addRule(self, rule, rruleorexrule='rrule'):
&quot;&quot;&quot;Add an rrule or exrule, defaults to rrule.&quot;&quot;&quot;
</span><span class="rem">- rulelist = getattr(self, rruleorexrule + 's', [])
- rulelist.append(rule)
- setattr(self, rruleorexrule + 's', rulelist)
</span><span class="add">+ try:
+ getattr(self, rruleorexrule + 's').append(rule)
+ except AttributeError:
+ setattr(self, rruleorexrule + 's', [rule])
</span><span class="cx">
def createDateUtilFromRule(self, dtstart):
&quot;&quot;&quot;Return an appropriate dateutil.rrule.rruleset.&quot;&quot;&quot;
</span><span class="lines">@@ -377,9 +379,11 @@
</span><span class="cx"> rule = list(self.rrules)[0]
if rulore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.sln.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.sln.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.cpp?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.sln?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
Index: internal/launchers/win/winlaunch/.cvsignore
diff -u /dev/null internal/launchers/win/winlaunch/.cvsignore:1.3
--- /dev/null Mon Jul 26 11:33:47 2004
+++ internal/launchers/win/winlaunch/.cvsignore Mon Jul 26 11:33:44 2004
@@ -0,0 +1,2 @@
+Debug
+Release
Index: internal/launchers/win/Makefile
diff -u internal/launchers/win/Makefile:1.7 internal/launchers/win/Makefile:1.8
--- internal/launchers/win/Makefile:1.7 Tue Jul 20 15:02:33 2004
+++ internal/launchers/win/Makefile Mon Jul 26 11:33:44 2004
@@ -6,30 +6,30 @@
DLLS=$(DLLS_DIR)/msvcp71d.dll $(DLLS_DIR)/msvcr71d.dll $(DLLS_DIR)/msvcrtd.dll
-build: winlaunch2/chandlerDebug.exe winlaunch1/chandler.exe
+build: winlaunch/chandlerDebug.exe winlaunch_bin/chandler.exe
-winlaunch2/chandlerDebug.exe: winlaunch2/winlaunch2.cpp
- devenv.com winlaunch2/winlaunch2.sln /build $(SNAP)
- cp winlaunch2/$(Snap)/chandlerDebug.exe $(BUILD_ROOT)
-
-winlaunch1/chandler.exe: winlaunch1/winlaunch1.cpp
- devenv.com winlaunch1/winlaunch1.sln /build $(SNAP)
- cp winlaunch1/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
+winlaunch/chandlerDebug.exe: winlaunch/winlaunch.cpp
+ devenv.com winlaunch/winlaunch.sln /build $(SNAP)
+ cp winlaunch/$(Snap)/chandlerDebug.exe $(BUILD_ROOT)
+
+winlaunch_bin/chandler.exe: winlaunch_bin/winlaunch_bin.cpp
+ devenv.com winlaunch_bin/winlauaskMixin</classes>
+
+ <Cloud itsName="Cloud">
+ <kind itemref="tasks:TaskMixin"/>
+ <Endpoint itsName="requestor">
+ <attribute value="tasks:requestor"/>
+ <includePolicy value="byValue"/>
+ </Endpoint>
+ <endpoints itemref="tasks:TaskMixin/Cloud/requestor"/>
+
+ <Endpoint itsName="requestee">
+ <attribute value="tasks:requestee"/>
+ <includePolicy value="byValue"/>
+ </Endpoint>
+ <endpoints itemref="tasks:TaskMixin/Cloud/requestee"/>
+
+ <Endpoint itsName="dependsOn">
+ <attribute value="tasks:dependsOn"/>
+ <includePolicy value="byValue"/>
+ </Endpoint>
+ <endpoints itemref="tasks:TaskMixin/Cloud/dependsOn"/>
+
+ <Endpoint itsName="preventsProgressOn">
+ <attribute value="tasks:preventsProgressOn"/>
+ <includePolicy value="byValue"/>
+ </Endpoint>
+ <endpoints itemref="tasks:TaskMixin/Cloud/preventsProgressOn"/>
+
+ </Cloud>
+
</Kind>
<Kind itsName="Task">
|
Sun, 22 Jun, 20:09 |
| ja...@wordzoo.com |
k-i[Commits] (vajda) released UUIDext 0.3-2 |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
k-i[Commits] (vajda) released UUIDext 0.3-2 |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
[No Subject] |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
[No Subject] |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
[No Subject] |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
[No Subject] |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
[No Subject] |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
[No Subject] |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
[No Subject] |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
[No Subject] |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
[No Subject] |
Thu, 24 Apr, 14:24 |
| m.@osafoundation.org> |
urrenceID set
</span><span class="rem">- if self is self.getFirstInRule():
</span><span class="add">+ if self == self.getFirstInRule():
</span><span class="cx"> self.modificationRecurrenceID = self.startTime
self.recurrenceID = self.startTime
</span><span class="rem">- # this kludge should be replaced with the new domain attribute aspect
-## elif name not in &quot;&quot;&quot;modifications modificationFor occurrences
-## occurrenceFor modifies isGenerated recurrenceID
-## _ignoreValueChanges modificationRecurrenceID queries
-## contentsOwner TPBSelectedItemOwner TPBDetailItemOwner
-## itemCollectionInclusions
-## &quot;&quot;&quot;.split():
- # this won't work with stamping, temporary solution to allow testing
</span><span class="add">+ # the changeName kludge should be replaced with the new domain attribute
+ # aspect, just using a fixed list of attributes which should trigger
+ # changeThis won't work with stamping
</span><span class="cx"> elif changeName:
if DEBUG:
logger.debug(&quot;about to changeThis in onValueChanged(name=%s) for %s&quot;, name, str(self))
</span><span class="lines">@@ -946,54 +947,55 @@
</span><span class="cx"> first = self.getFirstInRule()
self._deleteGeneratedOccurrences()
if first.hasLocalAttributeValue('modifications'):
</span><span class="add">+ until = first.rruleset.rrules.first().calculatedUntil()
</span><span class="cx"> for mod in first.modifications:
</span><span class="rem">- if mod.modifies == 'this':
- # this won't work for complicated rrulesets
- until = first.rruleset.rrules.first().calculatedUntil()
- if until is not None \
- and datetimeOp(mod.recurrenceID, '&gt;', until) \
- and mod != first:
- mod._ignoreValueChanges = True
- mod.delete()
</span><span class="add">+ # this won't work for complicated rrulesets
+ if until != None and datetimeOp(mod.recurrenceID, '&gt;', until):
+ mod._ignoreValueChanges = True
+ mod.delete()
</span><span class="cx">
# create a backup
first._getFirstGeneratedOccurrence(True)
</span><span class="rem">- def removeFuture(self):
</span><span class="add">+ def deleteFuture(self):
</span><span class="cx"> &quot;&quot;&quot;Delete self and all future occurrences and modifications.&quot;&quot;&quot;
</span><span class="rem">- pass
</span><span class="add">+ # changing the rule will delete self unless self is the master
+ master = self.getMaster()
+ if self.recurrenceID == master.startTime:
+ self.deleteAll()
+ else:
+ self.moveRuleEndBefore(self.recurrenceID)
</span><span class="cx">
</span><span class="rem">- def _deleteThisAndFutureModification(self):
- &quot;&quot;&quot;Remove 'thisandfuture' modification and all its occurrences.&quot;&quot;&quot;
</span><span class="add">+ def deleteThis(self):
+ &quot;&quot;&quot;Exclude this occurrence from the recurrence rule.&quot;&quot;&quot;
+ if not getattr(self.rruleset, 'exdates', None):
+ self.rruleset.exdates=[]
+ self.rruleset.exdates.append(self.recurrenceID)
+ del self
+
+ def deleteAll(self):
+ &quot;&quot;&quot;Delete master, all its modifications, occurrences, and rules.&quot;&quot;&quot;
</span><span class="cx"> for event in self.occurrences:
if event == self: #don't delete self quite yet
continue
event._ignoreValueChanges = True
event.delete(recursive=True)
</span><span class="rem">- self.rruleset._ignoreValueChanges = True
- self.rruleset.delete(recursive=True)
</span><span class="add">+ rruleset = self.rruleset
+ rruleset._ignoreValueChanges = True
+ # we don't want rruleset's recursive delete to get self yet
+ del self.rruleset
+ rruleset.delete(recursive=True)
</span><span class="cx"> self._ignoreValueChanges = True
self.delete(recursive=True)
def cleanFuture(self):
&quot;&quot;&quot;Delete all future occurrences and modifications.&quot;&quot;&quot;
</span><span class="rem">-
- def deleteLater(item):
- if datetimeOp(item.startTime, '&gt;', self.startTime):
- item._ignoreValueChanges = True
- item.delete()
-
</span><span class="cx"> master = self.getMaster()
</span><span class="rem">- for mod in master.modifications or []:
- if mod.modifies == 'thisandfuture':
- if datetimeOp(mod.startTime, '&gt;', self.startTime):
- mod._deleteThisAndFutureModification()
- else:
- for event in mod.occurrences or []:
- deleteLater(event)
</span><span class="cx"> for event in master.occurrences:
</span><span class="rem">- deleteLater(event)
</span><span class="add">+ if datetimeOp(event.startTime, '&gt;', self.startTime):
+ event._ignoreValueChanges = True
+ event.delete()
</span><span class="cx">
self._getFirstGeneratedOccurrence(True)
</span><span class="lines">@@ -1011,13 +1013,15 @@
</span><span class="cx"> # A THIS modification to master, make it the new master
self.moveCollections(master, event)
del event.rruleset
</span><span class="rem">- event.recurrenceID = event.startTime
</span><span class="add">+ del event.recurrenceID
</span><span class="cx"> event.modificationFor = None
event.occurrenceFor = event
masterHadModification = True
if masterHadModification:
master.delete()
</span><span class="add">+ else:
+ del master.recurrenceID
</span><span class="cx">
def isCustomRule(self):
</span></pre></div>
<a id="trunkchandlerparcelsosafpimcalendarRecurrencepy"></a>
<div class="modfile"><h4>Modified: trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py (7506 => 7507)</h4>
<pre class="diff">
<span class="info">--- trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py 2005-09-27 23:02:46 UTC (rev 7506)
+++ trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py 2005-09-27 23:54:04 UTC (rev 7507)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx"> value = coerceTimeZone(value, tzinfo)
return value
</span><span class="add">+ # TODO: more comments
</span><span class="cx"> kwargs = dict((k, getattr(self, k, None)) for k in
self.listNames + self.normalNames)
for key in self.specialNames:
</span><span class="lines">@@ -236,8 +237,8 @@
</span><span class="cx"> # Day tuples are (dayOrdinal, n-th week of the month),
# 0 means all weeks
listOfDayTuples=[(day, 0) for day in rrule._byweekday]
</span><span class="rem">- if rrule._bynweekday:
- listOfDayTuples.extend(tup for tup in rrule._bynweekday)
</span><span class="add">+ if rrule._bynweekday is not None:
+ listOfDayTuples.extend(rrule._bynweekday)
</span><span class="cx"> if len(listOfDayTuples) &gt; 0:
self.byweekday = []
for day, n in listOfDayTuples:
</span><span class="lines">@@ -257,10 +258,11 @@
</span><span class="cx"> self.until = coerceTimeZone(until, ICUtzinfo.getDefault())
for key in self.listNames:
</span><span class="add">+ # TODO: cache getattr(rrule, '_' + key)
</span><span class="cx"> if getattr(rrule, '_' + key) is not None and \
(key not in self.interpretedNames or \
len(getattr(rrule, '_' + key)) &gt; 1):
</span><span class="rem">- # cast tuples to list, or will the repository do this for us?
</span><span class="add">+ # cast tuples to list
</span><span class="cx"> setattr(self, key, list(getattr(rrule, '_' + key)))
# bymonthday and bymonth may be set automatically by dateutil, if so,
# unset them
</span><span class="lines">@@ -274,7 +276,6 @@
</span><span class="cx"> del self.bymonth
</span><span class="rem">-
</span><span class="cx"> def onValueChanged(self, name):
&quot;&quot;&quot;If the rule changes, update any associated events.&quot;&quot;&quot;
if name in self.listNames + self.normalNames + self.specialNames:
</span><span class="lines">@@ -317,9 +318,10 @@
</span><span class="cx">
def addRule(self, rule, rruleorexrule='rrule'):
&quot;&quot;&quot;Add an rrule or exrule, defaults to rrule.&quot;&quot;&quot;
</span><span class="rem">- rulelist = getattr(self, rruleorexrule + 's', [])
- rulelist.append(rule)
- setattr(self, rruleorexrule + 's', rulelist)
</span><span class="add">+ try:
+ getattr(self, rruleorexrule + 's').append(rule)
+ except AttributeError:
+ setattr(self, rruleorexrule + 's', [rule])
</span><span class="cx">
def createDateUtilFromRule(self, dtstart):
&quot;&quot;&quot;Return an appropriate dateutil.rrule.rruleset.&quot;&quot;&quot;
</span><span class="lines">@@ -377,9 +379,11 @@
</span><span class="cx"> rule = list(self.rrules)[0]
if rulore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.sln.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.sln.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.cpp?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.sln?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
Index: internal/launchers/win/winlaunch/.cvsignore
diff -u /dev/null internal/launchers/win/winlaunch/.cvsignore:1.3
--- /dev/null Mon Jul 26 11:33:47 2004
+++ internal/launchers/win/winlaunch/.cvsignore Mon Jul 26 11:33:44 2004
@@ -0,0 +1,2 @@
+Debug
+Release
Index: internal/launchers/win/Makefile
diff -u internal/launchers/win/Makefile:1.7 internal/launchers/win/Makefile:1.8
--- internal/launchers/win/Makefile:1.7 Tue Jul 20 15:02:33 2004
+++ internal/launchers/win/Makefile Mon Jul 26 11:33:44 2004
@@ -6,30 +6,30 @@
DLLS=$(DLLS_DIR)/msvcp71d.dll $(DLLS_DIR)/msvcr71d.dll $(DLLS_DIR)/msvcrtd.dll
-build: winlaunch2/chandlerDebug.exe winlaunch1/chandler.exe
+build: winlaunch/chandlerDebug.exe winlaunch_bin/chandler.exe
-winlaunch2/chandlerDebug.exe: winlaunch2/winlaunch2.cpp
- devenv.com winlaunch2/winlaunch2.sln /build $(SNAP)
- cp winlaunch2/$(Snap)/chandlerDebug.exe $(BUILD_ROOT)
-
-winlaunch1/chandler.exe: winlaunch1/winlaunch1.cpp
- devenv.com winlaunch1/winlaunch1.sln /build $(SNAP)
- cp winlaunch1/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
+winlaunch/chandlerDebug.exe: winlaunch/winlaunch.cpp
+ devenv.com winlaunch/winlaunch.sln /build $(SNAP)
+ cp winlaunch/$(Snap)/chandlerDebug.exe $(BUILD_ROOT)
+
+winlaunch_bin/chandler.exe: winlaunch_bin/winlaunch_bin.cpp
+ devenv.com winlaunch_bin/winlaunch_bin.sln /build $(SNAP)
+ cp winlaunch_bin/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
cp $(DLLS) $(BUILD_ROOT)/$(SNAP)/bin
else
DLLS=$(DLLS_DIR)/msvcp71.dll $(DLLS_DIR)/msvcr71.dll
-build: winlaunch2/chandler.exe winlaunch1/chandler.exe
+build: winlaunch/chandler.exe winlaunch_bin/chandler.exe
-winlaunch2/chandler.exe: winlaunch2/winlaunch2.cpp
- devenv.com winlaunch2/winlaunch2.sln /build $(SNAP)
- cp winlaunch2/$(Snap)/chandler.exe $(BUILD_ROOT)
-
-winlaunch1/chandler.exe: winlaunch1/winlaunch1.cpp
- devenv.com winlaunch1/winlaunch1.sln /build $(SNAP)
- cp winlaunch1/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
+winlaunch/chandler.exe: winlaunch/winlaunch.cpp
+ devenv.com winlaunch/winlaunch.sln /build $(SNAP)
+ cp winlaunch/$(Snap)/chandler.exe $(BUILD_ROOT)
+
+winlaunch_bin/chandler.exe: winlaunch_bin/winlaunch_bin.cpp
+ devenv.com winlaunch_bin/winlaunch_bin.sln /build $(SNAP)
+ cp winlaunch_bin/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
cp $(DLLS) $(BUILD_ROOT)/$(SNAP)/bin
clean:
Index: internal/launchers/win/winlaunch/winlaunch.vcproj
diff -u /dev/null internal/launchers/win/winlaunch/winlaunch.vcproj:1.8
--- /dev/null Mon Jul 26 11:33:47 2004
+++ internal/launchers/win/winlaunch/winlaunch.vcproj Mon Jul 26 11:33:44 2004
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="winlaunch"
+ ProjectGUID="{90AD6487-6195-4CEB-A81F-DD83DDB6B96C}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/chandlerDebug.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/winlaunch.pdb"
+ SubSystem="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(OutDir)\chandlerDebug.exe $(ProjectDir)..\..\..\..\chandler\chandlerDebug.exe"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/chandler.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(OutDir)\chandler.exe $(ProjectDir)..\..\..\..\chandler\chandler.exe"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\winlaunch.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
y get added to the sidebar |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
elf.startTime
</span><span class="rem">- # this kludge should be replaced with the new domain attribute aspect
-## elif name not in &quot;&quot;&quot;modifications modificationFor occurrences
-## occurrenceFor modifies isGenerated recurrenceID
-## _ignoreValueChanges modificationRecurrenceID queries
-## contentsOwner TPBSelectedItemOwner TPBDetailItemOwner
-## itemCollectionInclusions
-## &quot;&quot;&quot;.split():
- # this won't work with stamping, temporary solution to allow testing
</span><span class="add">+ # the changeName kludge should be replaced with the new domain attribute
+ # aspect, just using a fixed list of attributes which should trigger
+ # changeThis won't work with stamping
</span><span class="cx"> elif changeName:
if DEBUG:
logger.debug(&quot;about to changeThis in onValueChanged(name=%s) for %s&quot;, name, str(self))
</span><span class="lines">@@ -946,54 +947,55 @@
</span><span class="cx"> first = self.getFirstInRule()
self._deleteGeneratedOccurrences()
if first.hasLocalAttributeValue('modifications'):
</span><span class="add">+ until = first.rruleset.rrules.first().calculatedUntil()
</span><span class="cx"> for mod in first.modifications:
</span><span class="rem">- if mod.modifies == 'this':
- # this won't work for complicated rrulesets
- until = first.rruleset.rrules.first().calculatedUntil()
- if until is not None \
- and datetimeOp(mod.recurrenceID, '&gt;', until) \
- and mod != first:
- mod._ignoreValueChanges = True
- mod.delete()
</span><span class="add">+ # this won't work for complicated rrulesets
+ if until != None and datetimeOp(mod.recurrenceID, '&gt;', until):
+ mod._ignoreValueChanges = True
+ mod.delete()
</span><span class="cx">
# create a backup
first._getFirstGeneratedOccurrence(True)
</span><span class="rem">- def removeFuture(self):
</span><span class="add">+ def deleteFuture(self):
</span><span class="cx"> &quot;&quot;&quot;Delete self and all future occurrences and modifications.&quot;&quot;&quot;
</span><span class="rem">- pass
</span><span class="add">+ # changing the rule will delete self unless self is the master
+ master = self.getMaster()
+ if self.recurrenceID == master.startTime:
+ self.deleteAll()
+ else:
+ self.moveRuleEndBefore(self.recurrenceID)
</span><span class="cx">
</span><span class="rem">- def _deleteThisAndFutureModification(self):
- &quot;&quot;&quot;Remove 'thisandfuture' modification and all its occurrences.&quot;&quot;&quot;
</span><span class="add">+ def deleteThis(self):
+ &quot;&quot;&quot;Exclude this occurrence from the recurrence rule.&quot;&quot;&quot;
+ if not getattr(self.rruleset, 'exdates', None):
+ self.rruleset.exdates=[]
+ self.rruleset.exdates.append(self.recurrenceID)
+ del self
+
+ def deleteAll(self):
+ &quot;&quot;&quot;Delete master, all its modifications, occurrences, and rules.&quot;&quot;&quot;
</span><span class="cx"> for event in self.occurrences:
if event == self: #don't delete self quite yet
continue
event._ignoreValueChanges = True
event.delete(recursive=True)
</span><span class="rem">- self.rruleset._ignoreValueChanges = True
- self.rruleset.delete(recursive=True)
</span><span class="add">+ rruleset = self.rruleset
+ rruleset._ignoreValueChanges = True
+ # we don't want rruleset's recursive delete to get self yet
+ del self.rruleset
+ rruleset.delete(recursive=True)
</span><span class="cx"> self._ignoreValueChanges = True
self.delete(recursive=True)
def cleanFuture(self):
&quot;&quot;&quot;Delete all future occurrences and modifications.&quot;&quot;&quot;
</span><span class="rem">-
- def deleteLater(item):
- if datetimeOp(item.startTime, '&gt;', self.startTime):
- item._ignoreValueChanges = True
- item.delete()
-
</span><span class="cx"> master = self.getMaster()
</span><span class="rem">- for mod in master.modifications or []:
- if mod.modifies == 'thisandfuture':
- if datetimeOp(mod.startTime, '&gt;', self.startTime):
- mod._deleteThisAndFutureModification()
- else:
- for event in mod.occurrences or []:
- deleteLater(event)
</span><span class="cx"> for event in master.occurrences:
</span><span class="rem">- deleteLater(event)
</span><span class="add">+ if datetimeOp(event.startTime, '&gt;', self.startTime):
+ event._ignoreValueChanges = True
+ event.delete()
</span><span class="cx">
self._getFirstGeneratedOccurrence(True)
</span><span class="lines">@@ -1011,13 +1013,15 @@
</span><span class="cx"> # A THIS modification to master, make it the new master
self.moveCollections(master, event)
del event.rruleset
</span><span class="rem">- event.recurrenceID = event.startTime
</span><span class="add">+ del event.recurrenceID
</span><span class="cx"> event.modificationFor = None
event.occurrenceFor = event
masterHadModification = True
if masterHadModification:
master.delete()
</span><span class="add">+ else:
+ del master.recurrenceID
</span><span class="cx">
def isCustomRule(self):
</span></pre></div>
<a id="trunkchandlerparcelsosafpimcalendarRecurrencepy"></a>
<div class="modfile"><h4>Modified: trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py (7506 => 7507)</h4>
<pre class="diff">
<span class="info">--- trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py 2005-09-27 23:02:46 UTC (rev 7506)
+++ trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py 2005-09-27 23:54:04 UTC (rev 7507)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx"> value = coerceTimeZone(value, tzinfo)
return value
</span><span class="add">+ # TODO: more comments
</span><span class="cx"> kwargs = dict((k, getattr(self, k, None)) for k in
self.listNames + self.normalNames)
for key in self.specialNames:
</span><span class="lines">@@ -236,8 +237,8 @@
</span><span class="cx"> # Day tuples are (dayOrdinal, n-th week of the month),
# 0 means all weeks
listOfDayTuples=[(day, 0) for day in rrule._byweekday]
</span><span class="rem">- if rrule._bynweekday:
- listOfDayTuples.extend(tup for tup in rrule._bynweekday)
</span><span class="add">+ if rrule._bynweekday is not None:
+ listOfDayTuples.extend(rrule._bynweekday)
</span><span class="cx"> if len(listOfDayTuples) &gt; 0:
self.byweekday = []
for day, n in listOfDayTuples:
</span><span class="lines">@@ -257,10 +258,11 @@
</span><span class="cx"> self.until = coerceTimeZone(until, ICUtzinfo.getDefault())
for key in self.listNames:
</span><span class="add">+ # TODO: cache getattr(rrule, '_' + key)
</span><span class="cx"> if getattr(rrule, '_' + key) is not None and \
(key not in self.interpretedNames or \
len(getattr(rrule, '_' + key)) &gt; 1):
</span><span class="rem">- # cast tuples to list, or will the repository do this for us?
</span><span class="add">+ # cast tuples to list
</span><span class="cx"> setattr(self, key, list(getattr(rrule, '_' + key)))
# bymonthday and bymonth may be set automatically by dateutil, if so,
# unset them
</span><span class="lines">@@ -274,7 +276,6 @@
</span><span class="cx"> del self.bymonth
</span><span class="rem">-
</span><span class="cx"> def onValueChanged(self, name):
&quot;&quot;&quot;If the rule changes, update any associated events.&quot;&quot;&quot;
if name in self.listNames + self.normalNames + self.specialNames:
</span><span class="lines">@@ -317,9 +318,10 @@
</span><span class="cx">
def addRule(self, rule, rruleorexrule='rrule'):
&quot;&quot;&quot;Add an rrule or exrule, defaults to rrule.&quot;&quot;&quot;
</span><span class="rem">- rulelist = getattr(self, rruleorexrule + 's', [])
- rulelist.append(rule)
- setattr(self, rruleorexrule + 's', rulelist)
</span><span class="add">+ try:
+ getattr(self, rruleorexrule + 's').append(rule)
+ except AttributeError:
+ setattr(self, rruleorexrule + 's', [rule])
</span><span class="cx">
def createDateUtilFromRule(self, dtstart):
&quot;&quot;&quot;Return an appropriate dateutil.rrule.rruleset.&quot;&quot;&quot;
</span><span class="lines">@@ -377,9 +379,11 @@
</span><span class="cx"> rule = list(self.rrules)[0]
if rulore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.sln.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch1/winlaunch1.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.sln.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch2/winlaunch2.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.cpp?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.sln?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/launchers/win/winlaunch_bin/winlaunch_bin.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
Index: internal/launchers/win/winlaunch/.cvsignore
diff -u /dev/null internal/launchers/win/winlaunch/.cvsignore:1.3
--- /dev/null Mon Jul 26 11:33:47 2004
+++ internal/launchers/win/winlaunch/.cvsignore Mon Jul 26 11:33:44 2004
@@ -0,0 +1,2 @@
+Debug
+Release
Index: internal/launchers/win/Makefile
diff -u internal/launchers/win/Makefile:1.7 internal/launchers/win/Makefile:1.8
--- internal/launchers/win/Makefile:1.7 Tue Jul 20 15:02:33 2004
+++ internal/launchers/win/Makefile Mon Jul 26 11:33:44 2004
@@ -6,30 +6,30 @@
DLLS=$(DLLS_DIR)/msvcp71d.dll $(DLLS_DIR)/msvcr71d.dll $(DLLS_DIR)/msvcrtd.dll
-build: winlaunch2/chandlerDebug.exe winlaunch1/chandler.exe
+build: winlaunch/chandlerDebug.exe winlaunch_bin/chandler.exe
-winlaunch2/chandlerDebug.exe: winlaunch2/winlaunch2.cpp
- devenv.com winlaunch2/winlaunch2.sln /build $(SNAP)
- cp winlaunch2/$(Snap)/chandlerDebug.exe $(BUILD_ROOT)
-
-winlaunch1/chandler.exe: winlaunch1/winlaunch1.cpp
- devenv.com winlaunch1/winlaunch1.sln /build $(SNAP)
- cp winlaunch1/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
+winlaunch/chandlerDebug.exe: winlaunch/winlaunch.cpp
+ devenv.com winlaunch/winlaunch.sln /build $(SNAP)
+ cp winlaunch/$(Snap)/chandlerDebug.exe $(BUILD_ROOT)
+
+winlaunch_bin/chandler.exe: winlaunch_bin/winlaunch_bin.cpp
+ devenv.com winlaunch_bin/winlaunch_bin.sln /build $(SNAP)
+ cp winlaunch_bin/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
cp $(DLLS) $(BUILD_ROOT)/$(SNAP)/bin
else
DLLS=$(DLLS_DIR)/msvcp71.dll $(DLLS_DIR)/msvcr71.dll
-build: winlaunch2/chandler.exe winlaunch1/chandler.exe
+build: winlaunch/chandler.exe winlaunch_bin/chandler.exe
-winlaunch2/chandler.exe: winlaunch2/winlaunch2.cpp
- devenv.com winlaunch2/winlaunch2.sln /build $(SNAP)
- cp winlaunch2/$(Snap)/chandler.exe $(BUILD_ROOT)
-
-winlaunch1/chandler.exe: winlaunch1/winlaunch1.cpp
- devenv.com winlaunch1/winlaunch1.sln /build $(SNAP)
- cp winlaunch1/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
+winlaunch/chandler.exe: winlaunch/winlaunch.cpp
+ devenv.com winlaunch/winlaunch.sln /build $(SNAP)
+ cp winlaunch/$(Snap)/chandler.exe $(BUILD_ROOT)
+
+winlaunch_bin/chandler.exe: winlaunch_bin/winlaunch_bin.cpp
+ devenv.com winlaunch_bin/winlaunch_bin.sln /build $(SNAP)
+ cp winlaunch_bin/$(Snap)/chandler.exe $(BUILD_ROOT)/$(SNAP)/bin
cp $(DLLS) $(BUILD_ROOT)/$(SNAP)/bin
clean:
Index: internal/launchers/win/winlaunch/winlaunch.vcproj
diff -u /dev/null internal/launchers/win/winlaunch/winlaunch.vcproj:1.8
--- /dev/null Mon Jul 26 11:33:47 2004
+++ internal/launchers/win/winlaunch/winlaunch.vcproj Mon Jul 26 11:33:44 2004
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="winlaunch"
+ ProjectGUID="{90AD6487-6195-4CEB-A81F-DD83DDB6B96C}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/chandlerDebug.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/winlaunch.pdb"
+ SubSystem="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(OutDir)\chandlerDebug.exe $(ProjectDir)..\..\..\..\chandler\chandlerDebug.exe"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/chandler.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(OutDir)\chandler.exe $(ProjectDir)..\..\..\..\chandler\chandler.exe"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\winlaunch.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
y get added to the sidebar |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
[No Subject] |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
[No Subject] |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
[No Subject] |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
[No Subject] |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
[No Subject] |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
|