Browse Source

Add new target: rpmstuff

Alois Mahdal 9 years ago
parent
commit
cc16c95173
3 changed files with 21 additions and 4 deletions
  1. 15
    1
      src/include/build.sh
  2. 2
    2
      src/include/mkit.sh
  3. 4
    1
      src/mkit.mk

+ 15
- 1
src/include/build.sh View File

65
     #
65
     #
66
     # Create distributable tarball
66
     # Create distributable tarball
67
     #
67
     #
68
+    #FIXME: lacking Makefile skills, we do this step twice fot
69
+    #       rpmstuff, hence -f hack for gzip
70
+    #
68
     local version=$(get_version)
71
     local version=$(get_version)
69
     local dirname=$MKIT_PKGNAME-$version
72
     local dirname=$MKIT_PKGNAME-$version
70
     mkdir -p "$dirname"
73
     mkdir -p "$dirname"
71
     ini values "lists:dist" | xargs -I DIST_ITEM cp -R DIST_ITEM "$dirname"
74
     ini values "lists:dist" | xargs -I DIST_ITEM cp -R DIST_ITEM "$dirname"
72
     sed -i -e "s/^VERSION = .*/VERSION = $version/" "$dirname/config.mk"
75
     sed -i -e "s/^VERSION = .*/VERSION = $version/" "$dirname/config.mk"
73
     tar -cf "$dirname.tar" "$dirname"
76
     tar -cf "$dirname.tar" "$dirname"
74
-    gzip "$dirname.tar"
77
+    gzip -f "$dirname.tar"      # see above FIXME
75
     rm -rf "$dirname"
78
     rm -rf "$dirname"
76
 }
79
 }
77
 
80
 
81
+rpmstuff() {
82
+    #
83
+    # Build specfile
84
+    #
85
+    local specname="$(ini 1value ENV:PKGNAME).spec"
86
+    local specsrc="$(ini 1value "rpmstuff:spec_skel")"
87
+    test -n "$specsrc" || die "rpmstuff:spec_skel not specified"
88
+    test -f "$specsrc" || die "specfile template not found: $specsrc"
89
+    build1 "$specsrc" "$specname"
90
+}
91
+
78
 expand_includes() {
92
 expand_includes() {
79
     #
93
     #
80
     # Expand include directives
94
     # Expand include directives

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

46
     # Call correct function based on $1
46
     # Call correct function based on $1
47
     #
47
     #
48
     case $1 in
48
     case $1 in
49
-        build|build_manpages|clean|dist|install|release_?|uninstall)
49
+        build|build_manpages|clean|dist|rpmstuff|install|release_?|uninstall)
50
             $1
50
             $1
51
             ;;
51
             ;;
52
         *)
52
         *)
53
-            echo "usage: $(basename "$0") build|clean|dist|install|uninstall" >&2
53
+            echo "usage: $(basename "$0") build|clean|dist|rpmstuff|install|uninstall" >&2
54
     esac
54
     esac
55
 }
55
 }

+ 4
- 1
src/mkit.mk View File

24
 dist: clean
24
 dist: clean
25
 	@$(MKIT_DIR)/make dist
25
 	@$(MKIT_DIR)/make dist
26
 
26
 
27
+rpmstuff: dist
28
+	@$(MKIT_DIR)/make rpmstuff
29
+
27
 install: all
30
 install: all
28
 	@$(MKIT_DIR)/make install
31
 	@$(MKIT_DIR)/make install
29
 
32
 
39
 uninstall:
42
 uninstall:
40
 	@$(MKIT_DIR)/make uninstall
43
 	@$(MKIT_DIR)/make uninstall
41
 
44
 
42
-.PHONY: all options clean dist install uninstall release_x release_y release_z
45
+.PHONY: all options clean dist rpmstuff install uninstall release_x release_y release_z