schema commit, mark file writing simplification

VKCOM · Jun 27, 2024 · f535a56 · f535a56
1 parent d1d5817
commit f535a56
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -79,7 +79,7 @@ goldmaster_nocompile: build
 		--generateSchemaDocumentation \
 		--schemaURL="https://github.com/VKCOM/tl/blob/master/internal/tlcodegen/test/tls/goldmaster.tl" \
 		--schemaCommit=abcdefgh \
-		--schemaTimestamp=301812000 \
+		--schemaTimestamp=301822800 \
 		--pkgPath=github.com/vkcom/tl/$(GEN_PATH)/goldmaster/tl \
 		--basicPkgPath=$(BASIC_TL_PATH) \
 		--generateByteVersions=$(TL_BYTE_VERSIONS) \
@@ -93,7 +93,7 @@ goldmaster_nocompile: build
 		--generateSchemaDocumentation \
 		--schemaURL="https://github.com/VKCOM/tl/blob/master/internal/tlcodegen/test/tls/goldmaster.tl" \
 		--schemaCommit=abcdefgh \
-		--schemaTimestamp=301812000 \
+		--schemaTimestamp=301822800 \
 		--pkgPath=github.com/vkcom/tl/$(GEN_PATH)/goldmaster_nosplit/tl \
 		--basicPkgPath=$(BASIC_TL_PATH) \
 		--generateByteVersions=$(TL_BYTE_VERSIONS) \

diff --git a/internal/tlcodegen/test/gen/cases/tlgen2_version.txt b/internal/tlcodegen/test/gen/cases/tlgen2_version.txt
@@ -1,4 +1,4 @@
 tlgen version: (devel)
+schema url: 
 schema commit: 
 schema version: 0 (1970-01-01 00:00:00 +0000 UTC)
-schema url: 
diff --git a/internal/tlcodegen/test/gen/goldmaster/tlgen2_version.txt b/internal/tlcodegen/test/gen/goldmaster/tlgen2_version.txt
@@ -1,4 +1,4 @@
 tlgen version: (devel)
-schema commit: abcdefgh
-schema version: 301812000 (1979-07-26 04:40:00 +0000 UTC)
 schema url: https://github.com/VKCOM/tl/blob/master/internal/tlcodegen/test/tls/goldmaster.tl
+schema commit: abcdefgh
+schema version: 301822800 (1979-07-26 07:40:00 +0000 UTC)
diff --git a/internal/tlcodegen/test/gen/goldmaster/tljson.html b/internal/tlcodegen/test/gen/goldmaster/tljson.html
@@ -10,8 +10,8 @@ <h1>Schema</h1>
     <ul>
       <li>tlgen version: (devel)</li>
       <li><abbr>TL</abbr> schema <a href="https://github.com/VKCOM/tl/blob/master/internal/tlcodegen/test/tls/goldmaster.tl">url</a></li>
-      <li><abbr>TL</abbr> schema version 301812000 (1979-07-26 04:40:00 +0000 UTC)</li>
-      <li><abbr>TL</abbr> schema commit abcdefgh</li>
+      <li><abbr>TL</abbr> schema commit: abcdefgh</li>
+      <li><abbr>TL</abbr> schema version: 301822800 (1979-07-26 07:40:00 +0000 UTC)</li>
       <li><abbr>TL</abbr> ⟷ <abbr>JSON</abbr> mapping rules: <a href="https://github.com/VKCOM/tl/blob/master/TLJSON.md">TLJSON.md</a></li>
     </ul>
     <h1>Functions</h1>

diff --git a/internal/tlcodegen/test/gen/goldmaster_nosplit/tlgen2_version.txt b/internal/tlcodegen/test/gen/goldmaster_nosplit/tlgen2_version.txt
@@ -1,4 +1,4 @@
 tlgen version: (devel)
-schema commit: abcdefgh
-schema version: 301812000 (1979-07-26 04:40:00 +0000 UTC)
 schema url: https://github.com/VKCOM/tl/blob/master/internal/tlcodegen/test/tls/goldmaster.tl
+schema commit: abcdefgh
+schema version: 301822800 (1979-07-26 07:40:00 +0000 UTC)
diff --git a/internal/tlcodegen/test/gen/goldmaster_nosplit/tljson.html b/internal/tlcodegen/test/gen/goldmaster_nosplit/tljson.html
@@ -10,8 +10,8 @@ <h1>Schema</h1>
     <ul>
       <li>tlgen version: (devel)</li>
       <li><abbr>TL</abbr> schema <a href="https://github.com/VKCOM/tl/blob/master/internal/tlcodegen/test/tls/goldmaster.tl">url</a></li>
-      <li><abbr>TL</abbr> schema version 301812000 (1979-07-26 04:40:00 +0000 UTC)</li>
-      <li><abbr>TL</abbr> schema commit abcdefgh</li>
+      <li><abbr>TL</abbr> schema commit: abcdefgh</li>
+      <li><abbr>TL</abbr> schema version: 301822800 (1979-07-26 07:40:00 +0000 UTC)</li>
       <li><abbr>TL</abbr> ⟷ <abbr>JSON</abbr> mapping rules: <a href="https://github.com/VKCOM/tl/blob/master/TLJSON.md">TLJSON.md</a></li>
     </ul>
     <h1>Functions</h1>

diff --git a/internal/tlcodegen/tlgen.go b/internal/tlcodegen/tlgen.go
@@ -666,9 +666,9 @@ func (gen *Gen2) WriteToDir(outdir string) error {
 	}
 	markerContent := fmt.Sprintf(buildVersionFormat,
 		strings.TrimSpace(TLGenVersion()),
+		strings.TrimSpace(gen.options.SchemaURL),
 		strings.TrimSpace(gen.options.SchemaCommit),
-		gen.options.SchemaTimestamp, time.Unix(int64(gen.options.SchemaTimestamp), 0).UTC(),
-		strings.TrimSpace(gen.options.SchemaURL))
+		gen.options.SchemaTimestamp, time.Unix(int64(gen.options.SchemaTimestamp), 0).UTC())
 	if err := gen.addCodeFile(markerFile, markerContent); err != nil {
 		return err
 	}
@@ -692,6 +692,7 @@ func (gen *Gen2) WriteToDir(outdir string) error {
 				continue
 			}
 		}
+		written++
 		if err := os.WriteFile(f, []byte(code), 0644); err != nil {
 			return fmt.Errorf("error writing file %q: %w", f, err)
 		}