--- a/Tools__ProjectBuilderAssistantApplication.st	Sat Feb 23 14:03:44 2013 +0100
+++ b/Tools__ProjectBuilderAssistantApplication.st	Sat Feb 23 14:27:45 2013 +0100
@@ -32,7 +32,7 @@
 		companyNameHolder compilerWarnMessageHolder
 		compilerWarnMessageVisibleHolder listOfPrerequisitesInProject
 		nameOfUsedCompilerSuiteHolder usedCompilerIndexHolder'
-	classVariableNames:'LastUsedCompiler'
+	classVariableNames:'LastUsedCompiler Debugging'
 	poolDictionaries:''
 	category:'System-Support-Projects'
 !
@@ -248,7 +248,7 @@
             windowSpecSelector: page5_specifyIncludedClasses
             enterCallbackSelector: enterContentsSpecification
             canEnterQuerySelector: #canEnterContentsSelection
-            infoText: 'Define which (other) classes are to be included. Press "<I>Scan</I>" to include all classes of the package; browse to edit the contents manually.'
+            infoText: 'Define which (other) classes are to be included. Do not include classes from other packages here. Press "<I>Scan</I>" to include all classes of the package; browse to edit the contents manually.'
         )
 
         (AssistantPageSpec
@@ -1066,7 +1066,7 @@
                     label: 'Browse Project Definition'
                     name: 'Button3'
                     translateLabel: true
-                    model: doBrowseProjectDefinitionClass
+                    model: doBrowseProjectDefinitionClassForPrereqs
                     extent: (Point 180 22)
                   )
                  (ActionButtonSpec
@@ -1365,6 +1365,15 @@
              (SpecCollection
                 collection: (
                  (ActionButtonSpec
+                    label: 'Finder on Build Directory'
+                    name: 'Button13'
+                    activeHelpKey: openFinder
+                    visibilityChannel: osIsOSX
+                    translateLabel: true
+                    model: doOpenFinder
+                    extent: (Point 167 22)
+                  )
+                 (ActionButtonSpec
                     label: 'Explorer on Build Directory'
                     name: 'Button13'
                     activeHelpKey: openExplorer
@@ -1701,6 +1710,11 @@
 doBrowseBuildDirectory
     <resource: #uiCallback>
 
+    projectBuilder isNil ifTrue:[ self getProjectBuilder ].
+    projectBuilder buildDirectory isNil ifTrue:[
+        Dialog information:'No build directory yet'.
+        ^  self
+    ].
     UserPreferences current fileBrowserClass
         openIn:projectBuilder packageBuildDirectory asFilename
 "/    projectBuilder packageBuildDirectory asFilename openExplorer
@@ -1726,6 +1740,18 @@
     ].
 !
 
+doBrowseProjectDefinitionClassForPrereqs
+    <resource: #uiCallback>
+
+    |defClass|
+
+    self hasProjectSelected ifTrue:[
+        defClass := self selectedProjectDefinition.
+        UserPreferences systemBrowserClass 
+            openInClass:defClass class selector:#preRequisites.
+    ].
+!
+
 doBrowseStartupClass
     <resource: #uiCallback>
 
@@ -1786,39 +1812,28 @@
 !
 
 doOpenExplorer
+    projectBuilder isNil ifTrue:[ self getProjectBuilder ].
+    projectBuilder buildDirectory isNil ifTrue:[
+        Dialog information:'No build directory yet'.
+        ^  self
+    ].
     projectBuilder packageBuildDirectory asFilename openExplorer
 
     "Modified: / 21-07-2012 / 12:29:21 / cg"
 !
 
-doStartMakeAll
-    <resource: #uiCallback>
-
-    self stopMakeButtonVisible value:true.
-    self startMakeButtonEnabled value:false.
-
-    self infoHolder value:'Building (make) - please wait...'.
-    makeOutputWindow clear.
-
-    makeProcess := 
-            [
-                [
-                    self runBuildProcess:'all'
-                ] ensure:[
-                    self stopMakeButtonVisible value:false.
-                    self startMakeButtonEnabled value:true.
-                    makeProcess := nil.
-                    self updateButtonEnableState.
-                    self infoHolder value:''.
-                ].
-            ] newProcess.
-
-    makeProcess priority:4.
-    makeProcess priorityRange:(4 to:8).
-    makeProcess resume.
+doOpenFinder
+    projectBuilder isNil ifTrue:[ self getProjectBuilder ].
+    projectBuilder buildDirectory isNil ifTrue:[
+        Dialog information:'No build directory yet'.
+        ^  self
+    ].
+    projectBuilder packageBuildDirectory asFilename openFinder
+
+    "Modified: / 21-07-2012 / 12:29:21 / cg"
 !
 
-doStartMakeExe
+doStartMake:whichTarget
     <resource: #uiCallback>
 
     self stopMakeButtonVisible value:true.
@@ -1845,6 +1860,18 @@
     makeProcess resume.
 !
 
+doStartMakeAll
+    <resource: #uiCallback>
+
+    self doStartMake:'all'
+!
+
+doStartMakeExe
+    <resource: #uiCallback>
+
+    self doStartMake:'exe'
+!
+
 doStopMake
     <resource: #uiCallback>
 
@@ -1917,12 +1944,18 @@
             makeOutputWindow cr.
             makeOutputWindow nextPutLine:(ex description colorizeAllWith:Color white on:Color red).
             makeOutputWindow endEntry.
+            Debugging == true ifTrue:[ ex reject ].
             ex proceed.
         ] do:[
             projectBuilder buildWithColorizedOutputTo:makeOutputWindow.
         ].
     ].
 
+    "
+     Debugging := true.   
+     Debugging := false.   
+    "
+
     "Modified: / 27-09-2012 / 14:56:38 / cg"
 !
 
@@ -2236,6 +2269,14 @@
     ^ newStartupClassName.
 !
 
+osIsOSX
+   ^ true "/ OperatingSystem isOSXlike
+!
+
+osIsWindows
+   ^ OperatingSystem isMSWINDOWSlike
+!
+
 productNameHolder
     <resource: #uiAspect>
 
@@ -3083,3 +3124,4 @@
 version_CVS
     ^ '$Header$'
 ! !
+