Procházet zdrojové kódy

add subpackage descriptions and make menu

pkgmaker should only be run by developers. takes to long otherwise.
generated Config.in data can be committed.
Waldemar Brodkorb před 16 roky
rodič
revize
fed4931572
4 změnil soubory, kde provedl 13 přidání a 2 odebrání
  1. 5 0
      Makefile
  2. 4 0
      mk/build.mk
  3. 1 0
      mk/package.mk
  4. 3 2
      package/pkgmaker

+ 5 - 0
Makefile

@@ -64,6 +64,8 @@ pkg-help:
 	@echo 'This does not automatically resolve package dependencies!'
 	@echo 'This does not automatically resolve package dependencies!'
 
 
 dev-help:
 dev-help:
+	@echo 'Regenerate menu information via "make menu"'
+	@echo
 	@echo 'Fast way of updating package patches:'
 	@echo 'Fast way of updating package patches:'
 	@echo '  run "make package=<pkgname> clean" to start with a good base'
 	@echo '  run "make package=<pkgname> clean" to start with a good base'
 	@echo '  run "make package=<pkgname> patch" to fetch, unpack and patch the source'
 	@echo '  run "make package=<pkgname> patch" to fetch, unpack and patch the source'
@@ -135,6 +137,9 @@ package_index: .prereq_done
 bulk: .prereq_done
 bulk: .prereq_done
 	@${GMAKE_INV} bulk
 	@${GMAKE_INV} bulk
 
 
+menu: .prereq_done
+	@${GMAKE_INV} menu
+
 world: .prereq_done
 world: .prereq_done
 	@${GMAKE_INV} world
 	@${GMAKE_INV} world
 
 

+ 4 - 0
mk/build.mk

@@ -352,3 +352,7 @@ distclean:
 		${TOPDIR}/package/*/info.mk
 		${TOPDIR}/package/*/info.mk
 
 
 endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
+
+menu:
+	mksh $(TOPDIR)/package/pkgmaker
+

+ 1 - 0
mk/package.mk

@@ -149,6 +149,7 @@ define PKG_template
 ALL_PKGOPTS+=	$(1)
 ALL_PKGOPTS+=	$(1)
 PKGNAME_$(1)=	$(2)
 PKGNAME_$(1)=	$(2)
 PKGDEPS_$(1)=	$(4)
 PKGDEPS_$(1)=	$(4)
+PKGDESC_$(1)=	$(5)
 IPKG_$(1)=	$(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX}
 IPKG_$(1)=	$(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX}
 IDIR_$(1)=	$(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)
 IDIR_$(1)=	$(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)
 ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},)
 ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},)

+ 3 - 2
package/pkgmaker

@@ -53,7 +53,8 @@ for sd in */Makefile; do
 		while (( ${#xf} < 34 )); do
 		while (( ${#xf} < 34 )); do
 			xf=$xf.
 			xf=$xf.
 		done
 		done
-		print "\tprompt \"$xf ${pd:-$pn}\""
+		desc=$($GMAKE show=PKGDESC_$xu)
+		print "\tprompt \"$xf ${desc:-${pd:-$pn}}\""
 		print \\ttristate
 		print \\ttristate
 		print \\tdefault n
 		print \\tdefault n
 		deps=$($GMAKE show=PKGDEPS_$xu)
 		deps=$($GMAKE show=PKGDEPS_$xu)
@@ -111,6 +112,6 @@ EOF
 		print \\thelp
 		print \\thelp
 		print "\t  flavour ADK_PACKAGE_${dnu}_$pf"
 		print "\t  flavour ADK_PACKAGE_${dnu}_$pf"
 	done
 	done
-	) >Config.new
+	) >Config.in
 	cd ..
 	cd ..
 done
 done