--- a/ProjectBrowser.st Wed Sep 22 17:57:16 1999 +0200
+++ b/ProjectBrowser.st Wed Sep 22 18:26:18 1999 +0200
@@ -1652,7 +1652,7 @@
#(#MenuItem
#label: 'Save Project File'
#translateLabel: true
- #value: #saveProject
+ #value: #saveProjectFile
#enabled: #hasProjectSelectedAndProjectFilenameHolder
)
#(#MenuItem
@@ -3649,7 +3649,7 @@
buildClassLibrary
"compile a binary class library in the projects directory"
- |p dir f|
+ |p dir f diagnosticFile diagnostic error textBox|
p := self currentProject.
p isNil ifTrue:[
@@ -3672,7 +3672,7 @@
(self confirm:'''Make.proto'' does not exist in project directory\\Create ?' withCRs) ifFalse:[
^ self
].
- p buildMakefiles.
+ self buildMakefiles.
].
"/ check for Makefile ...
@@ -3684,7 +3684,36 @@
p createMakefile.
].
-
+ "/ now, execute the makefile found there ...
+ diagnosticFile := Filename newTemporary.
+ diagnostic := diagnosticFile writeStream.
+ error := false.
+
+ [
+ self withCursor:Cursor wait do:[
+ OperatingSystem
+ executeCommand:'make'
+ inputFrom:nil
+ outputTo:diagnostic
+ errorTo:diagnostic
+ inDirectory:(dir pathName)
+ onError:[error := true].
+ ].
+
+ diagnostic close.
+
+ textBox := TextBox new.
+ textBox initialText:(diagnosticFile readStream contents).
+ textBox title:'Make Diagnostic output:'.
+ textBox readOnly:true.
+ textBox noCancel.
+ textBox label:'Make Diagnostic output'.
+ textBox extent:(600@250); sizeFixed:true.
+ textBox showAtPointer.
+
+ ] valueNowOrOnUnwindDo:[
+ diagnosticFile delete
+ ].
!
@@ -4061,7 +4090,7 @@
]
!
-saveProject
+saveProjectFile
|d p|
self modifiedChannel value ifTrue:[