@@ -55,6 +55,8 @@ func (sb *ShimBuilder) Build(project common.AppProject) error {
55
55
}
56
56
57
57
if ! built {
58
+ fmt .Println ("Using go build to build shim..." )
59
+
58
60
err := simpleGoBuild (project )
59
61
if err != nil {
60
62
return err
@@ -124,7 +126,7 @@ func prepareShim(project common.AppProject, shim string) (bool, error) {
124
126
makefilePath := filepath .Join (shimFilePath , dirShim , fileMakefile )
125
127
126
128
if _ , err := os .Stat (goBuildFilePath ); err == nil {
127
- fmt .Println ("This trigger makes use of a go build file ..." )
129
+ fmt .Println ("Using build. go to build shim... ..." )
128
130
129
131
err = util .CopyFile (goBuildFilePath , filepath .Join (project .SrcDir (), fileBuildGo ))
130
132
if err != nil {
@@ -136,15 +138,21 @@ func prepareShim(project common.AppProject, shim string) (bool, error) {
136
138
if err != nil {
137
139
return false , err
138
140
}
141
+
142
+ return true , nil
139
143
} else if _ , err := os .Stat (makefilePath ); err == nil {
140
144
//look for Makefile and execute it
141
- fmt .Println ("Make File:" , makefilePath )
145
+ fmt .Println ("Using make file to build shim..." )
142
146
143
147
err = util .CopyFile (makefilePath , filepath .Join (project .SrcDir (), fileMakefile ))
144
148
if err != nil {
145
149
return false , err
146
150
}
147
151
152
+ if Verbose () {
153
+ fmt .Println ("Make File:" , makefilePath )
154
+ }
155
+
148
156
// Execute make
149
157
cmd := exec .Command ("make" , "-C" , project .SrcDir ())
150
158
cmd .Stdout = os .Stdout
@@ -155,6 +163,8 @@ func prepareShim(project common.AppProject, shim string) (bool, error) {
155
163
if err != nil {
156
164
return false , err
157
165
}
166
+
167
+ return true , nil
158
168
} else {
159
169
return false , nil
160
170
}
0 commit comments