Sfoglia il codice sorgente

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 anni fa
parent
commit
772c962f77
3 ha cambiato i file con 19 aggiunte e 3 eliminazioni
  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 Vedi File

@@ -40,11 +40,13 @@ _valid_targets() {
40 40
     echo debstuff
41 41
     echo dist
42 42
     echo install
43
+    echo release
43 44
     echo release_x
44 45
     echo release_y
45 46
     echo release_z
46 47
     echo rpmstuff
47 48
     echo uninstall
49
+    echo vbump
48 50
     echo vbump_x
49 51
     echo vbump_y
50 52
     echo vbump_z

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

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

+ 3
- 3
src/mkit.mk Vedi File

@@ -27,7 +27,7 @@ install: all
27 27
 	@$(MKIT_DIR)/make install
28 28
 
29 29
 release:
30
-	@$(MKIT_DIR)/make release_z
30
+	@$(MKIT_DIR)/make release
31 31
 
32 32
 release_x:
33 33
 	@$(MKIT_DIR)/make release_x
@@ -42,7 +42,7 @@ uninstall:
42 42
 	@$(MKIT_DIR)/make uninstall
43 43
 
44 44
 vbump:
45
-	@$(MKIT_DIR)/make vbump_z
45
+	@$(MKIT_DIR)/make vbump
46 46
 
47 47
 vbump_x:
48 48
 	@$(MKIT_DIR)/make vbump_x
@@ -53,4 +53,4 @@ vbump_y:
53 53
 vbump_z:
54 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