use CVSExecutable instead of CVSBindir
(to allow for a name different from \"cvs\", such as
\"turtoisecvs.exe\" or \"cvs-11.exe\")
--- a/AbstractSettingsApplication.st Thu Sep 21 16:27:27 2006 +0200
+++ b/AbstractSettingsApplication.st Thu Sep 21 16:52:16 2006 +0200
@@ -219,16 +219,17 @@
cvsRootPrototypeList addPerModuleRoot removeEnabled
perModuleRootModule acceptChannel removePerModuleRoot
perModuleRoot cvsRootHolder selectedPerModuleRoot
- cvsBinDirectoryHolder rootsPerModule cvsLoginInModuleEnabled
- cvsLoginEnabled selectedManagerTypeIndexHolder
- managerIsCVSSourceCodeManager managerIsStoreSourceCodeManager
- storeLoginEnabled storeHostPrototypeList storeHostnameHolder
- storeUsernameHolder storePasswordHolder
- perStoreModuleHostnameHolder perStoreModuleUsernameHolder
- perStoreModulePasswordHolder perStoreModuleRoot
- perStoreModuleRootModule selectedPerStoreModuleRoot
- storeConnectEnabled storeConnectInModuleEnabled
- perModuleFieldsEnableHolder perStoreModuleFieldsEnableHolder'
+ cvsBinDirectoryHolder cvsExecutableHolder rootsPerModule
+ cvsLoginInModuleEnabled cvsLoginEnabled
+ selectedManagerTypeIndexHolder managerIsCVSSourceCodeManager
+ managerIsStoreSourceCodeManager storeLoginEnabled
+ storeHostPrototypeList storeHostnameHolder storeUsernameHolder
+ storePasswordHolder perStoreModuleHostnameHolder
+ perStoreModuleUsernameHolder perStoreModulePasswordHolder
+ perStoreModuleRoot perStoreModuleRootModule
+ selectedPerStoreModuleRoot storeConnectEnabled
+ storeConnectInModuleEnabled perModuleFieldsEnableHolder
+ perStoreModuleFieldsEnableHolder'
classVariableNames:'RecentlyUsedCVSRoots RecentlyUsedStoreHosts LastStoreHost
LastStoreUser LastStorePassword'
poolDictionaries:''
@@ -10246,7 +10247,7 @@
(SpecCollection
collection: (
(LabelSpec
- label: 'CVS BinDirectory:'
+ label: 'CVS Command or Path:'
name: 'Label1'
layout: (LayoutFrame 0 0.0 0 0 60 0.25 22 0)
level: 0
@@ -10254,11 +10255,11 @@
adjust: right
)
(InputFieldSpec
- name: 'BinDirectoryField'
+ name: 'CVSExecutableField'
layout: (LayoutFrame 64 0.25 0 0 0 1 22 0)
enableChannel: useManager
tabable: true
- model: cvsBinDirectoryHolder
+ model: cvsExecutableHolder
acceptChannel: acceptChannel
acceptOnPointerLeave: true
)
@@ -10565,6 +10566,8 @@
)
)
+
+ "Modified: / 21-09-2006 / 16:53:22 / cg"
! !
!AbstractSettingsApplication::SourceCodeManagementSettingsAppl methodsFor:'accessing'!
@@ -10614,7 +10617,7 @@
self checkClassesWhenCheckingIn value:(currentUserPrefs at:#checkClassesWhenCheckingIn ifAbsent:true).
self cvsRootHolder value:CVSSourceCodeManager repositoryName ? '/cvs/stx'.
- self cvsBinDirectoryHolder value:CVSSourceCodeManager cvsBinDirectory.
+ self cvsExecutableHolder value:CVSSourceCodeManager cvsExecutable.
rootsPerModule notNil ifTrue:[
self listOfModules removeAll.
@@ -10622,7 +10625,7 @@
].
"/ self selectedPerModuleRootChanged.
- "Modified: / 16-08-2006 / 11:08:01 / cg"
+ "Modified: / 21-09-2006 / 16:52:47 / cg"
!
basicSaveSettings
@@ -10762,15 +10765,9 @@
]
].
].
- CVSSourceCodeManager cvsBinDirectory:(self cvsBinDirectoryHolder value withoutSeparators).
+ CVSSourceCodeManager cvsExecutable:(self cvsExecutableHolder value withoutSeparators).
CVSSourceCodeManager initializeForRepository:(cvsRoot := self cvsRootHolder value).
- CVSSourceCodeManager cvsBinDirectory ~= self cvsBinDirectoryHolder value withoutSeparators ifTrue:[
- self warn:'CVS does not seem to like your Bin-Directory setting...'.
- "/ self cvsBinDirectoryHolder value:CVSSourceCodeManager cvsBinDirectory.
- AbortSignal raise "/ avoid clearing modfified
- ].
-
RecentlyUsedCVSRoots isNil ifTrue:[
RecentlyUsedCVSRoots := OrderedCollection new.
].
@@ -10780,6 +10777,8 @@
RecentlyUsedCVSRoots removeLast.
].
].
+
+ "Modified: / 21-09-2006 / 16:52:54 / cg"
!
cvsLogin:cvsRoot
@@ -10955,12 +10954,14 @@
^ checkClassesWhenCheckingIn.
!
-cvsBinDirectoryHolder
- cvsBinDirectoryHolder isNil ifTrue:[
- cvsBinDirectoryHolder := ValueHolder new.
- cvsBinDirectoryHolder onChangeSend:#updateModifiedChannel to:self
- ].
- ^ cvsBinDirectoryHolder.
+cvsExecutableHolder
+ cvsExecutableHolder isNil ifTrue:[
+ cvsExecutableHolder := ValueHolder new.
+ cvsExecutableHolder onChangeSend:#updateModifiedChannel to:self
+ ].
+ ^ cvsExecutableHolder.
+
+ "Created: / 21-09-2006 / 15:37:06 / cg"
!
cvsLoginEnabled
@@ -11538,7 +11539,7 @@
].
self selectedManager isCVS ifTrue:[
- ((CVSSourceCodeManager cvsBinDirectory ? '') ~= (self cvsBinDirectoryHolder value ? '') withoutSeparators)
+ ((CVSSourceCodeManager cvsExecutable ? '') ~= (self cvsExecutableHolder value ? '') withoutSeparators)
ifTrue:[^ true].
(CVSSourceCodeManager repositoryName ? '/files/CVS' ~= self cvsRootHolder value)
@@ -11555,6 +11556,8 @@
].
^ false
+
+ "Modified: / 21-09-2006 / 16:53:07 / cg"
! !
!AbstractSettingsApplication::StyleSettingsAppl class methodsFor:'defaults'!
@@ -13312,5 +13315,5 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.253 2006-09-21 07:38:50 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.254 2006-09-21 14:52:16 cg Exp $'
+! !