[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2029: Move SQL queries to a separate script

Denis Silakov denis.silakov at rosalab.ru
Mon Dec 17 08:08:12 UTC 2012


------------------------------------------------------------
revno: 2029
committer: Denis Silakov <denis.silakov at rosalab.ru>
branch nick: build_env
timestamp: Mon 2012-12-17 12:08:12 +0400
message:
  Move SQL queries to a separate script
added:
  headers/mkversionfiles
modified:
  headers/Makefile
-------------- next part --------------
=== modified file 'headers/Makefile'
--- a/headers/Makefile	2012-12-14 11:31:08 +0000
+++ b/headers/Makefile	2012-12-17 08:08:12 +0000
@@ -9,38 +9,31 @@
 LSB_DEVEL_VERSIONS = $(shell cat lsb_devel_versions)
 ARCHVER = $(foreach ver,$(LSB_VERSIONS),defs-$(arch)_$(ver))
 DATADEFS := $(foreach arch,$(LSB_SUPPORTED_ARCHS),$(ARCHVER))
-#DATADEFS := $(foreach archver,$(shell mysql $(DBOPTS) $$LSBDB -e "SELECT Aname,LVvalue FROM Architecture,LSBVersion WHERE LVvalue>='3.0'" | grep -v Aname | sed s/\\t/_/g),headers-$(archver))
 
 all: 
 
-gensrc: lsb_versions core_filelist desktop_filelist headers datadefs headerlist lsb_devel_archver
+gensrc: versionfiles core_filelist desktop_filelist headers datadefs headerlist
 
 datadefs: $(DATADEFS)
 
 devel: $(foreach archver,$(shell cat lsb_devel_archver),headers-$(archver))
 
-headers: headerlist lsb_versions lsb_devel_archver $(foreach headerfile,$(shell cat headerlist),$(headerfile))
+headers: headerlist versionfiles $(foreach headerfile,$(shell cat headerlist),$(headerfile))
 	@echo Made header files
 
-defs-%: headerlist lsb_versions lsb_devel_archver $(foreach headerfile,$(shell cat headerlist),%/$(headerfile).defs)
+defs-%: headerlist lsb_versionfiles $(foreach headerfile,$(shell cat headerlist),%/$(headerfile).defs)
 	@echo Made data definitions for $*
 
 core_filelist desktop_filelist:
 	../mkfilelists --headers
 
-.PHONY: lsb_versions lsb_devel_versions lsb_devel_archver headerlist
+.PHONY: versionfiles headerlist
 
 headerlist:
 	./getheaderlist > headerlist
 
-lsb_versions:
-	mysql $(DBOPTS) $$LSBDB -e "SELECT LVvalue FROM LSBVersion WHERE LVvalue>='3.0'" | grep -v LVvalue > lsb_versions
-
-lsb_devel_versions:
-	mysql $(DBOPTS) $$LSBDB -e "SELECT LVvalue FROM LSBVersion WHERE LVreleased='No'" | grep -v LVvalue > lsb_devel_versions
-
-lsb_devel_archver:
-	mysql $(DBOPTS) $$LSBDB -e "SELECT Aname,LVvalue FROM Architecture,LSBVersion WHERE LVreleased='No'" | grep -v Aname | sed s/\\t/_/g > lsb_devel_archver
+versionfiles:
+	./mkversionfiles
 
 %.defs: 
 	mkdir -p $(dir $(shell echo "$@" | sed s/_/\\//))

=== added file 'headers/mkversionfiles'
--- a/headers/mkversionfiles	1970-01-01 00:00:00 +0000
+++ b/headers/mkversionfiles	2012-12-17 08:08:12 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# build lsb_versions, lsb_devel_versions and lsb_devel_archver
+
+DBOPTS="-h ${LSBDBHOST} -u ${LSBUSER} --password=${LSBDBPASSWD}"
+
+mysql ${DBOPTS} ${LSBDB} -e "SELECT LVvalue FROM LSBVersion WHERE LVvalue>='3.0'" | grep -v LVvalue > lsb_versions
+mysql ${DBOPTS} ${LSBDB} -e "SELECT LVvalue FROM LSBVersion WHERE LVreleased='No'" | grep -v LVvalue > lsb_devel_versions
+mysql ${DBOPTS} ${LSBDB} -e "SELECT Aname,LVvalue FROM Architecture,LSBVersion WHERE LVreleased='No'" | grep -v Aname | sed s/\\t/_/g > lsb_devel_archver



More information about the lsb-messages mailing list