removed sha256 of source code, using git comit now

VKCOM · Jun 19, 2024 · 658e5af · 658e5af
1 parent 5c968b1
commit 658e5af
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 128 deletions.
diff --git a/Makefile b/Makefile
@@ -25,18 +25,14 @@ TLOS_PATH := $(GEN_PATH)
 BASIC_TL_PATH := github.com/vkcom/tl/pkg/basictl
 
 TL_BYTE_VERSIONS := ch_proxy.,ab.
-SHA256_CHECKSUM := $(shell go run ./cmd/sha256sum ./internal)
-ifndef SHA256_CHECKSUM
-$(error SHA256_CHECKSUM failed to set, problem with go run cmd/sha256sum internal)
-endif
 
 .PHONY: build
 
 all: build
 
 build:
-	@echo "Building tlgen with sha256 checksum $(SHA256_CHECKSUM)"
-	@$(GO) build -ldflags "$(COMMON_LDFLAGS)  -X 'github.com/vkcom/tl/internal/tlcodegen.buildSHA256Checksum=$(SHA256_CHECKSUM)'" -buildvcs=false -o target/bin/tlgen ./cmd/tlgen
+	@echo "Building tlgen"
+	@$(GO) build -ldflags "$(COMMON_LDFLAGS)" -buildvcs=false -o target/bin/tlgen ./cmd/tlgen
 
 tlo-bootstrap: build
 	@./target/bin/tlgen \
@@ -84,6 +80,7 @@ goldmaster_nocompile: build
 		--copyrightPath=./COPYRIGHT \
 		--outdir=./$(GEN_PATH)/goldmaster \
 		--generateSchemaDocumentation \
+		--schemaURL="https://github.com/VKCOM/tl/blob/master/internal/tlcodegen/test/tls/goldmaster.tl" \
 		--pkgPath=github.com/vkcom/tl/$(GEN_PATH)/goldmaster/tl \
 		--basicPkgPath=$(BASIC_TL_PATH) \
 		--generateByteVersions=$(TL_BYTE_VERSIONS) \
@@ -96,6 +93,7 @@ goldmaster_nocompile: build
 		--copyrightPath=./COPYRIGHT \
 		--outdir=./$(GEN_PATH)/goldmaster_nosplit \
 		--generateSchemaDocumentation \
+		--schemaURL="https://github.com/VKCOM/tl/blob/master/internal/tlcodegen/test/tls/goldmaster.tl" \
 		--pkgPath=github.com/vkcom/tl/$(GEN_PATH)/goldmaster_nosplit/tl \
 		--basicPkgPath=$(BASIC_TL_PATH) \
 		--generateByteVersions=$(TL_BYTE_VERSIONS) \

diff --git a/cmd/sha256sum/sha256sum.go b/cmd/sha256sum/sha256sum.go
diff --git a/cmd/tlgen/main2.go b/cmd/tlgen/main2.go
@@ -60,7 +60,7 @@ func parseFlags(opt *tlcodegen.Gen2Options) {
 		"whether to generate methods to read json in old way")
 	flag.BoolVar(&opt.SchemaDocumentation, "generateSchemaDocumentation", false,
 		"whether to generate .html representation of schema in to tljson.html file")
-	flag.StringVar(&opt.SchemaURLTemplate, "schemaURLTemplate", "",
+	flag.StringVar(&opt.SchemaURL, "schemaURL", "",
 		"template for url to current schema if documentation is generated")
 
 	// C++

diff --git a/internal/tlcodegen/qt_tljson_html.qtpl b/internal/tlcodegen/qt_tljson_html.qtpl
@@ -1,12 +1,9 @@
 {% package tlcodegen %}
 
 {% import "fmt" %}
-{% import "time" %}
 {% import "strings" %}
 
-{% import "github.com/vkcom/tl/pkg/build" %}
-
-{%- func tlJSON(gen *Gen2, buildSHA256Checksum string) -%}
+{%- func tlJSON(gen *Gen2, tlgenVersion string) -%}
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -17,8 +14,9 @@
   <body>
     <h1>Schema</h1>
     <ul>
-      {%- if gen.options.SchemaURLTemplate != "" -%}
-      <li><abbr>TL</abbr> schema: <a href="{%s= fmt.Sprintf(gen.options.SchemaURLTemplate, build.Commit()) %}"><code>{%s build.Commit() %}</code></a> commit timestamp {%s time.Unix(int64(build.CommitTimestamp()), 0).Format(time.RFC3339) %} compiled at {%s build.Time() %}</li>
+      <li>tlgen version: {%s tlgenVersion %}</li>
+      {%- if gen.options.SchemaURL != "" -%}
+      <li><abbr>TL</abbr> <a href="{%s gen.options.SchemaURL %}">schema</a></li>
       {%- endif -%}
       <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>

diff --git a/internal/tlcodegen/qt_tljson_html.qtpl.go b/internal/tlcodegen/qt_tljson_html.qtpl.go
diff --git a/internal/tlcodegen/test/gen/goldmaster/tljson.html b/internal/tlcodegen/test/gen/goldmaster/tljson.html
@@ -8,6 +8,8 @@
   <body>
     <h1>Schema</h1>
     <ul>
+      <li>tlgen version: (devel)</li>
+      <li><abbr>TL</abbr> <a href="https://github.com/VKCOM/tl/blob/master/internal/tlcodegen/test/tls/goldmaster.tl">schema</a></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/tljson.html b/internal/tlcodegen/test/gen/goldmaster_nosplit/tljson.html
@@ -8,6 +8,8 @@
   <body>
     <h1>Schema</h1>
     <ul>
+      <li>tlgen version: (devel)</li>
+      <li><abbr>TL</abbr> <a href="https://github.com/VKCOM/tl/blob/master/internal/tlcodegen/test/tls/goldmaster.tl">schema</a></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
@@ -51,8 +51,6 @@ const TlJSONHTML = "tljson.html"
 // And we do not want stable checksum of go files tlgen folder, because checksums are not comparable and there is no idea how old that version is
 const buildVersionString = "tlgen2 version "
 
-var buildSHA256Checksum = "" // filled when building
-
 var (
 	errSeeHere                = fmt.Errorf("see here")
 	errFieldNameCollision     = fmt.Errorf("field name collision")
@@ -326,7 +324,7 @@ type Gen2Options struct {
 	GenerateRandomCode     bool
 	GenerateLegacyJsonRead bool
 	SchemaDocumentation    bool
-	SchemaURLTemplate      string
+	SchemaURL              string
 
 	// C++
 	RootCPPNamespace string
@@ -701,7 +699,7 @@ func (gen *Gen2) WriteToDir(outdir string) error {
 		// motivation - do not modify marker file if no code changed. Greatly reduces efforts to refactor tlgen.
 		f := filepath.Join(outdir, markerFile)
 		_, version := TLGenBuildInfo()
-		code := buildVersionString + strings.TrimSpace(version) + "\n" // stupid editors insist on empty line at the end
+		code := buildVersionString + strings.TrimSpace(version) + "\n" // many editors insist on empty line at the end
 		written++
 		if err := os.WriteFile(f, []byte(code), 0644); err != nil {
 			return fmt.Errorf("error writing file %q: %w", f, err)
@@ -1193,7 +1191,8 @@ func GenerateCode(tl tlast.TL, options Gen2Options) (*Gen2, error) {
 	}
 
 	if options.SchemaDocumentation {
-		if err := gen.addCodeFile(TlJSONHTML, tlJSON(gen, buildSHA256Checksum)); err != nil {
+		_, version := TLGenBuildInfo()
+		if err := gen.addCodeFile(TlJSONHTML, tlJSON(gen, version)); err != nil {
 			return nil, err
 		}
 	}