Adjusted repository layout to match release tarballs.

webserver-llc · Oct 24, 2022 · e28ef0f · e28ef0f
1 parent 1cd19f4
commit e28ef0f
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 24 deletions.
diff --git a/docs/text/LICENSE → LICENSE b/docs/text/LICENSE → LICENSE
diff --git a/docs/text/README → README b/docs/text/README → README
diff --git a/auto/configure → configure b/auto/configure → configure
diff --git a/docs/GNUmakefile b/docs/GNUmakefile
@@ -1,35 +1,33 @@
 
 VER=	$(shell grep 'define ANGIE_VERSION' src/core/angie.h		\
 		| sed -e 's/^.*"\(.*\)".*/\1/')
-ANGIE=	angie-$(VER)
-TEMP=	tmp
 XSLS?=	xslscript.pl
 
 
 all:		changes
 
-changes:	$(TEMP)/$(ANGIE)/CHANGES.ru				\
-		$(TEMP)/$(ANGIE)/CHANGES
+changes:	CHANGES.ru						\
+		CHANGES
 
+	hg ci -m "Generated changes for $(VER) release."
 
-$(TEMP)/$(ANGIE)/CHANGES.ru:	docs/dtd/changes.dtd			\
-				docs/xml/angie/changes.xml		\
-				docs/xml/change_log_conf.xml		\
-				docs/xslt/changes.xslt
+.PHONY:	all changes
 
-	mkdir -p $(TEMP)/$(ANGIE)
+
+CHANGES.ru:	docs/dtd/changes.dtd					\
+		docs/xml/angie/changes.xml				\
+		docs/xml/change_log_conf.xml				\
+		docs/xslt/changes.xslt
 
 	xmllint --noout --valid docs/xml/angie/changes.xml
 	xsltproc --stringparam lang ru					\
 		-o $@ docs/xslt/changes.xslt docs/xml/angie/changes.xml
 
 
-$(TEMP)/$(ANGIE)/CHANGES:	docs/dtd/changes.dtd			\
-				docs/xml/angie/changes.xml		\
-				docs/xml/change_log_conf.xml		\
-				docs/xslt/changes.xslt
-
-	mkdir -p $(TEMP)/$(ANGIE)
+CHANGES:	docs/dtd/changes.dtd					\
+		docs/xml/angie/changes.xml				\
+		docs/xml/change_log_conf.xml				\
+		docs/xslt/changes.xslt
 
 	xmllint --noout --valid docs/xml/angie/changes.xml
 	xsltproc --stringparam lang en					\

diff --git a/docs/html/50x.html → html/50x.html b/docs/html/50x.html → html/50x.html
diff --git a/docs/html/index.html → html/index.html b/docs/html/index.html → html/index.html
diff --git a/docs/man/angie.8 → man/angie.8 b/docs/man/angie.8 → man/angie.8
diff --git a/misc/GNUmakefile b/misc/GNUmakefile
@@ -13,15 +13,6 @@ PCRE =		pcre2-10.39
 
 release: export
 
-	mv $(TEMP)/$(ANGIE)/auto/configure $(TEMP)/$(ANGIE)
-
-	mv $(TEMP)/$(ANGIE)/docs/text/LICENSE $(TEMP)/$(ANGIE)
-	mv $(TEMP)/$(ANGIE)/docs/text/README $(TEMP)/$(ANGIE)
-	mv $(TEMP)/$(ANGIE)/docs/html $(TEMP)/$(ANGIE)
-	mv $(TEMP)/$(ANGIE)/docs/man $(TEMP)/$(ANGIE)
-
-	$(MAKE) -f docs/GNUmakefile changes
-
 	rm -r $(TEMP)/$(ANGIE)/docs
 	rm -r $(TEMP)/$(ANGIE)/misc