Browse Source

Enable 'release' and 'vbump' targets directly in mkit/make

Usage of GNU Make really is just a sugar, so we should enable all
targets also for direct mkit/make invocation.
Alois Mahdal 7 years ago
parent
commit
772c962f77
3 changed files with 19 additions and 3 deletions
  1. 2
    0
      src/include/mkit.sh
  2. 14
    0
      src/include/release.sh
  3. 3
    3
      src/mkit.mk

+ 2
- 0
src/include/mkit.sh View File

40
     echo debstuff
40
     echo debstuff
41
     echo dist
41
     echo dist
42
     echo install
42
     echo install
43
+    echo release
43
     echo release_x
44
     echo release_x
44
     echo release_y
45
     echo release_y
45
     echo release_z
46
     echo release_z
46
     echo rpmstuff
47
     echo rpmstuff
47
     echo uninstall
48
     echo uninstall
49
+    echo vbump
48
     echo vbump_x
50
     echo vbump_x
49
     echo vbump_y
51
     echo vbump_y
50
     echo vbump_z
52
     echo vbump_z

+ 14
- 0
src/include/release.sh View File

169
         '
169
         '
170
 }
170
 }
171
 
171
 
172
+release() {
173
+    #
174
+    # Perform release on Z level
175
+    #
176
+    _release z
177
+}
178
+
172
 release_x() {
179
 release_x() {
173
     #
180
     #
174
     # Perform release on X level
181
     # Perform release on X level
190
     _release z
197
     _release z
191
 }
198
 }
192
 
199
 
200
+vbump() {
201
+    #
202
+    # Perform version bump on Z level
203
+    #
204
+    _vbump z
205
+}
206
+
193
 vbump_x() {
207
 vbump_x() {
194
     #
208
     #
195
     # Perform version bump on X level
209
     # Perform version bump on X level

+ 3
- 3
src/mkit.mk View File

27
 	@$(MKIT_DIR)/make install
27
 	@$(MKIT_DIR)/make install
28
 
28
 
29
 release:
29
 release:
30
-	@$(MKIT_DIR)/make release_z
30
+	@$(MKIT_DIR)/make release
31
 
31
 
32
 release_x:
32
 release_x:
33
 	@$(MKIT_DIR)/make release_x
33
 	@$(MKIT_DIR)/make release_x
42
 	@$(MKIT_DIR)/make uninstall
42
 	@$(MKIT_DIR)/make uninstall
43
 
43
 
44
 vbump:
44
 vbump:
45
-	@$(MKIT_DIR)/make vbump_z
45
+	@$(MKIT_DIR)/make vbump
46
 
46
 
47
 vbump_x:
47
 vbump_x:
48
 	@$(MKIT_DIR)/make vbump_x
48
 	@$(MKIT_DIR)/make vbump_x
53
 vbump_z:
53
 vbump_z:
54
 	@$(MKIT_DIR)/make vbump_z
54
 	@$(MKIT_DIR)/make vbump_z
55
 
55
 
56
-.PHONY: all clean dist rpmstuff install uninstall release_x release_y release_z vbump_x vbump_y vbump_z
56
+.PHONY: all clean dist rpmstuff install uninstall release release_x release_y release_z vbump vbump_x vbump_y vbump_z