remove some code

Author: kjk

.clangd

@@ -7,6 +7,13 @@ CompileFlags:
     - -I${workspaceFolder}/mupdf/include
     - -I${workspaceFolder}/src
     - -I${workspaceFolder}/src/utils
+		- -DUNICODE
+		- -DWIN32
+		- -D_WIN32
+		- -D_CRT_SECURE_NO_WARNINGS
+		- -DWINVER=0x0a00
+		- -D_WIN32_WINNT=0x0a00
+		- -DPRE_RELEASE_VER=3.3
 
 If:
   PathExclude:

do/build.go

@@ -81,107 +81,6 @@ func createPdbLzsa(dir string) error {
 	return createLzsaFromFiles("SumatraPDF.pdb.lzsa", dir, pdbFiles)
 }
 
-// build, sign, upload latest pre-release build
-func buildSignAndUploadPreRelease() {
-	if !isGithubMyMasterBranch() {
-		logf("buildSignAndUploadPreRelease: skipping build because not on master branch\n")
-		return
-	}
-	ver := getPreReleaseVer()
-	logf("buildSignAndUploadPreRelease: ver: %s\n", ver)
-	isClean := isGitClean(".")
-	if !isClean {
-		logf("will not upload because git is not clean\n")
-	}
-	verifyBuildNotInStorageMust(newMinioR2Client(), buildTypePreRel, ver)
-	verifyBuildNotInStorageMust(newMinioBackblazeClient(), buildTypePreRel, ver)
-
-	detectSigntoolPathMust()
-	detectMakeAppxPathMust()
-	genHTMLDocsForApp()
-
-	setBuildConfigPreRelease()
-	defer revertBuildConfig()
-
-	msbuildPath := detectMsbuildPathMust()
-	dirDst := filepath.Join("out", "artifacts", ver)
-	if !isClean {
-		dirDst += "-dirty"
-	}
-	must(os.RemoveAll(dirDst))
-
-	build := func(plat *Platform) {
-		prefix := "SumatraPDF-prerel-" + plat.suffix
-		srcDstFileNames := getFileNamesWithPrefix(prefix)
-
-		slnPath := filepath.Join("vs2022", "SumatraPDF.sln")
-		buildDir := plat.outDir
-		config := "Release"
-		// when !isClean we assume it's interactive testing so we don't
-		// re-build from scratch because it's time consuming
-		if isClean {
-			os.RemoveAll(buildDir)
-		}
-
-		p := fmt.Sprintf(`/p:Configuration=%s;Platform=%s`, config, plat.vsplatform)
-		t := `/t:test_util`
-		runExeLoggedMust(msbuildPath, slnPath, t, p, `/m`)
-		// can't run arm binaries in x86 CI
-		if plat.vsplatform != kVSPlatformArm64 {
-			runTestUtilMust(buildDir)
-		}
-
-		t = `/t:SumatraPDF;SumatraPDF-dll;PdfFilter;PdfPreview`
-		runExeLoggedMust(msbuildPath, slnPath, t, p, `/m`)
-		err := createPdbZip(buildDir)
-		must(err)
-		err = createPdbLzsa(buildDir)
-		must(err)
-
-		// copy to dest dir
-		for _, file := range srcDstFileNames {
-			srcPath := filepath.Join(buildDir, file[0])
-			dstName := file[1]
-			dstPath := filepath.Join(dirDst, dstName)
-			copyFile2Must(dstPath, srcPath, true)
-		}
-	}
-
-	for _, plat := range platforms {
-		build(plat)
-	}
-
-	// sign all files in one swoop
-	// build can take a long time and signing rquires user interaction
-	// so wait for user to press enter
-	waitForEnter("\nPress enter to sign and upload the builds")
-	err := signExesInDir(dirDst)
-	if err != nil {
-		os.RemoveAll(dirDst)
-		must(err)
-	}
-
-	// create SumatraPDF-{prefix}.zip with SumatraPDF-{prefix}.exe inside
-	// this must happen after signing
-	for _, plat := range platforms {
-		prefix := "SumatraPDF-prerel-" + plat.suffix
-		nameInZip := fmt.Sprintf("SumatraPDF-prerel-%s-%s.exe", ver, plat.suffix)
-		zipPath := filepath.Join(dirDst, fmt.Sprintf("%s.zip", prefix))
-		exePath := filepath.Join(dirDst, fmt.Sprintf("%s.exe", prefix))
-		err = createExeZipWithGoWithName(dirDst, exePath, zipPath, nameInZip)
-		must(err)
-	}
-
-	manifestPath := filepath.Join(dirDst, "SumatraPDF-prerel-manifest.txt")
-	createManifestMust(manifestPath)
-
-	if !isClean {
-		logf("buildSignAndUploadPreRelease: will skip upload because git is not clean\n")
-		uploadDryRun = true
-	}
-	uploadToStorage(buildTypePreRel, ver, dirDst)
-}
-
 // func copyBuiltFiles(dstDir string, srcDir string, prefix string) {
 // 	files := getFileNamesWithPrefix(prefix)
 // 	for _, f := range files {
@@ -391,57 +290,6 @@ func addZipFile(w *zip.Writer, path string) error {
 	return addZipFileWithName(w, path, nameInZip)
 }
 
-func createExeZipWithGoWithName(dir, exePath, zipPath, nameInZip string) error {
-	f, err := os.Create(zipPath)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		err = f.Close()
-	}()
-	zw := zip.NewWriter(f)
-	err = addZipFileWithName(zw, exePath, nameInZip)
-	if err != nil {
-		return err
-	}
-	err = zw.Close()
-	if err != nil {
-		return err
-	}
-	return err
-}
-
-// func createExeZipWithPigz(dir string) {
-// 	srcFile := "SumatraPDF.exe"
-// 	srcPath := filepath.Join(dir, srcFile)
-// 	panicIf(!fileExists(srcPath), "file '%s' doesn't exist\n", srcPath)
-
-// 	// this is the file that pigz.exe will create
-// 	dstFileTmp := "SumatraPDF.exe.zip"
-// 	dstPathTmp := filepath.Join(dir, dstFileTmp)
-// 	removeFileMust(dstPathTmp)
-
-// 	// this is the file we want at the end
-// 	dstFile := "SumatraPDF.zip"
-// 	dstPath := filepath.Join(dir, dstFile)
-// 	removeFileMust(dstPath)
-
-// 	wd, err := os.Getwd()
-// 	must(err)
-// 	pigzExePath := filepath.Join(wd, "bin", "pigz.exe")
-// 	panicIf(!fileExists(pigzExePath), "file '%s' doesn't exist\n", pigzExePath)
-// 	cmd := exec.Command(pigzExePath, "-11", "--keep", "--zip", srcFile)
-// 	// in pigz we don't control the name of the file created inside so
-// 	// so when we run pigz the current directory is the same as
-// 	// the directory with the file we're compressing
-// 	cmd.Dir = dir
-// 	runCmdMust(cmd)
-
-// 	panicIf(!fileExists(dstPathTmp), "file '%s' doesn't exist\n", dstPathTmp)
-// 	err = os.Rename(dstPathTmp, dstPath)
-// 	must(err)
-// }
-
 var pdbFiles = []string{"libmupdf.pdb", "SumatraPDF-dll.pdb", "SumatraPDF.pdb"}
 
 func createPdbZip(dir string) error {
@@ -575,47 +423,6 @@ func buildPreRelease(plat *Platform) {
 	buildAll("Release", plat.vsplatform, plat.outDir)
 }
 
-// TODO:
-func buildRelease() {
-	panic("FIXME")
-
-	// make sure we can sign the executables, early exit if missing
-	detectSigntoolPathMust()
-	genHTMLDocsForApp()
-
-	ver := getVerForBuildType(buildTypeRel)
-	s := fmt.Sprintf("buidling release version %s", ver)
-	defer makePrintDuration(s)()
-
-	verifyBuildNotInStorageMust(newMinioR2Client(), buildTypeRel, ver)
-	verifyBuildNotInStorageMust(newMinioBackblazeClient(), buildTypeRel, ver)
-
-	removeReleaseBuilds()
-	setBuildConfigRelease()
-	defer revertBuildConfig()
-
-	// build("Release", kPlatformNameIntel32)
-	// nameInZip := fmt.Sprintf("SumatraPDF-%s-32.exe", ver)
-	// createExeZipWithGoWithName(rel32Dir, nameInZip)
-
-	// build("Release", kPlatformNameIntel64)
-	// nameInZip = fmt.Sprintf("SumatraPDF-%s-64.exe", ver)
-	// createExeZipWithGoWithName(rel64Dir, nameInZip)
-
-	// build("Release", kPlatformNameArm64)
-	// nameInZip = fmt.Sprintf("SumatraPDF-%s-arm64.exe", ver)
-	// createExeZipWithGoWithName(relArm64Dir, nameInZip)
-
-	// createManifestMust(ver)
-
-	// dstDir := filepath.Join("out", "artifacts", "rel-"+ver)
-	// prefix := fmt.Sprintf("SumatraPDF-%s", ver)
-	// copyBuiltFiles(dstDir, rel32Dir, prefix)
-	// copyBuiltFiles(dstDir, rel64Dir, prefix+"-64")
-	// copyBuiltFiles(dstDir, relArm64Dir, prefix+"-arm64")
-	// copyBuiltManifest(dstDir, ver, prefix)
-}
-
 func detectVersionsCodeQL() {
 	//ver := getGitLinearVersionMust()
 	ver := 16648 // we don't have git history in codeql checkout

do/check_accesskyes.go

@@ -64,13 +64,14 @@ func extractAccesskeyGroups(path string) map[string]*accessGroup {
 			}
 		} else if isAltGroupStartOrEnd(line) {
 			panicIf(group == nil, "Can't use ACCESSKEY_ALTERNATIVE outside of group")
-			if line[2] == '[' {
+			switch line[2] {
+			case '[':
 				panicIf(line[25] != ' ', "Typo?")
 				panicIf(group.inAltGroup, "Nested ACCESSKEY_ALTERNATIVE isn't supported")
 				group.inAltGroup = true
-			} else if line[2] == '|' {
+			case '|':
 				panicIf(!group.inAltGroup, "Unexpected ACCESSKEY_ALTERNATIVE alternative")
-			} else {
+			default:
 				panicIf(!group.inAltGroup, "Unexpected ACCESSKEY_ALTERNATIVE end")
 				group.inAltGroup = false
 			}

do/gen_docs.go

@@ -48,7 +48,7 @@ const h1BreadcrumbsEnd = `</div>
 </div>
 `
 
-func renderFirstH1(w io.Writer, h *ast.Heading, entering bool, seenFirstH1 *bool) {
+func renderFirstH1(w io.Writer, _ *ast.Heading, entering bool, seenFirstH1 *bool) {
 	if entering {
 		io.WriteString(w, h1BreadcrumbsStart)
 	} else {
@@ -104,7 +104,7 @@ func genCsvTableHTML(records [][]string, noHeader bool) string {
 	return strings.Join(lines, "\n")
 }
 
-func renderCodeBlock(w io.Writer, cb *ast.CodeBlock, entering bool) {
+func renderCodeBlock(w io.Writer, cb *ast.CodeBlock, _ bool) {
 	csvContent := bytes.TrimSpace(cb.Literal)
 	// os.WriteFile("temp.csv", csvContent, 0644)
 	r := csv.NewReader(bytes.NewReader(csvContent))
@@ -117,7 +117,7 @@ func renderCodeBlock(w io.Writer, cb *ast.CodeBlock, entering bool) {
 	io.WriteString(w, s)
 }
 
-func renderColumns(w io.Writer, columns *Columns, entering bool) {
+func renderColumns(w io.Writer, _ *Columns, entering bool) {
 	if entering {
 		io.WriteString(w, `<div class="doc-columns">`)
 	} else {

do/main.go

@@ -221,41 +221,35 @@ func Main() {
 	)
 
 	var (
-		flgBuildLogview              bool
-		flgBuildNo                   int
-		flgBuildPreRelease           bool
-		flgBuildRelease              bool
-		flgBuildSmoke                bool
-		flgBuildCodeQL               bool
-		flgCheckAccessKeys           bool
-		flgCIBuild                   bool
-		flgCIDailyBuild              bool
-		flgClangFormat               bool
-		flgClean                     bool
-		flgDiff                      bool
-		flgGenDocs                   bool
-		flgGenSettings               bool
-		flgGenWebsiteDocs            bool
-		flgRunLogView                bool
-		flgRegenPremake              bool
-		flgRunTests                  bool
-		flgTransDownload             bool
-		flgTriggerCodeQL             bool
-		flgUpdateGoDeps              bool
-		flgUpdateVer                 string
-		flgUpload                    bool
-		flgWc                        bool
-		flgBuildSignUploadPreRelease bool
+		flgBuildLogview    bool
+		flgBuildNo         int
+		flgBuildSmoke      bool
+		flgBuildCodeQL     bool
+		flgCheckAccessKeys bool
+		flgCIBuild         bool
+		flgCIDailyBuild    bool
+		flgClangFormat     bool
+		flgClean           bool
+		flgDiff            bool
+		flgGenDocs         bool
+		flgGenSettings     bool
+		flgGenWebsiteDocs  bool
+		flgRunLogView      bool
+		flgRegenPremake    bool
+		flgRunTests        bool
+		flgTransDownload   bool
+		flgTriggerCodeQL   bool
+		flgUpdateGoDeps    bool
+		flgUpdateVer       string
+		flgUpload          bool
+		flgWc              bool
 	)
 
 	{
 		flag.BoolVar(&flgRegenPremake, "premake", false, "regenerate premake*.lua files")
 		flag.BoolVar(&flgCIBuild, "ci", false, "run CI steps")
 		flag.BoolVar(&flgCIDailyBuild, "ci-daily", false, "run CI daily steps")
 		flag.BoolVar(&flgBuildSmoke, "build-smoke", false, "run smoke build (installer for 64bit release)")
-		flag.BoolVar(&flgBuildSignUploadPreRelease, "build-sign-upload-pre-rel", false, "build, sign and upload pre-release")
-		flag.BoolVar(&flgBuildPreRelease, "build-pre-rel", false, "build pre-release")
-		flag.BoolVar(&flgBuildRelease, "build-release", false, "build release")
 		flag.BoolVar(&flgBuildCodeQL, "build-codeql", false, "build for codeql")
 		//flag.BoolVar(&flgBuildLzsa, "build-lzsa", false, "build MakeLZSA.exe")
 		flag.BoolVar(&flgUpload, "upload", false, "upload the build to s3 and do spaces")
@@ -399,17 +393,6 @@ func Main() {
 		opts.upload = true
 	}
 
-	if flgBuildSignUploadPreRelease {
-		buildSignAndUploadPreRelease()
-		return
-	}
-
-	if flgBuildRelease {
-		// only when building locally, not on GitHub CI
-		opts.verifyTranslationUpToDate = true
-		opts.doCleanCheck = true
-		opts.releaseBuild = true
-	}
 	//opts.doCleanCheck = false // for ad-hoc testing
 
 	ensureBuildOptionsPreRequesites(opts)
@@ -458,21 +441,6 @@ func Main() {
 		return
 	}
 
-	if flgBuildRelease {
-		// TODO: must fix signing and upload
-		buildRelease()
-		return
-	}
-
-	// this one is typically for me to build locally, so build all projects
-	// to build less use -build-smoke
-	if flgBuildPreRelease {
-		cleanReleaseBuilds()
-		genHTMLDocsForApp()
-		buildPreRelease(platform32)
-		return
-	}
-
 	if flgUpdateVer != "" {
 		ensureAllUploadCreds()
 		updateAutoUpdateVer(flgUpdateVer)