crossbind 2.0.0-beta.52 → 2.0.0-beta.53

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # crossbind
 
+## 2.0.0-beta.53
+
+### Patch Changes
+
+- The rebuild the source stamp triggers now clears the previous upstream release's configure
+  output and staged install tree first. Without that, an install step fails where it cannot
+  overwrite a file it did not create, which is what stopped the beta.52 publish partway.
+
 ## 2.0.0-beta.52
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crossbind",
-  "version": "2.0.0-beta.52",
+  "version": "2.0.0-beta.53",
   "license": "MIT",
   "homepage": "https://crossbind.dev",
   "repository": {

package/src/actions/buildLib.js

@@ -6,7 +6,7 @@ import { getBuildTargets, getFilteredTargetSpec } from './target.js';
 import state from '../state/index.js';
 import logger from '../utils/logger.js';
 import findFiles from '../utils/findFiles.js';
-import { getSourceFingerprint, isSourceFingerprintStale, writeSourceFingerprint } from '../utils/sourceFingerprint.js';
+import { getSourceFingerprint, isSourceFingerprintStale, staleTargetDirectories, writeSourceFingerprint } from '../utils/sourceFingerprint.js';
 
 export default function buildLib(targetParams, options = {}) {
     let isChanged = false;
@@ -24,6 +24,13 @@ export default function buildLib(targetParams, options = {}) {
         const sourceFingerprint = getSourceFingerprint(state.config);
         const sourceChanged = isSourceFingerprintStale(libdir, sourceFingerprint);
         if (isCargo || sourceChanged || !fs.existsSync(`${libdir}/lib`)) {
+            if (sourceChanged) {
+                for (const stale of staleTargetDirectories({
+                    buildPath: state.config.paths.build,
+                    outputPath: state.config.paths.output,
+                    targetPath: target.path,
+                })) fs.rmSync(stale, { recursive: true, force: true });
+            }
             // createLib caches on existence too, so re-entering is not enough: a stale stamp means
             // the lib on disk came from a different upstream release and has to be rebuilt.
             createLib(target, 'Source', { buildSource: true, force: sourceChanged });

package/src/utils/sourceFingerprint.js

@@ -25,3 +25,16 @@ export function writeSourceFingerprint(libdir, fingerprint) {
     fs.mkdirSync(libdir, { recursive: true });
     fs.writeFileSync(`${libdir}/${SOURCE_FINGERPRINT_FILE}`, fingerprint);
 }
+
+// A changed upstream release leaves the previous configure output and install tree behind. Reusing
+// them makes `make install` fail where it cannot chmod a file it did not create, and would leave
+// files of the old version in the output next to the new ones.
+export function staleTargetDirectories({ buildPath, outputPath, targetPath }) {
+    return [
+        `${buildPath}/Source-Release/${targetPath}`,
+        `${buildPath}/Source-Release/prebuilt/${targetPath}`,
+        `${buildPath}/Source-Debug/${targetPath}`,
+        `${buildPath}/Source-Debug/prebuilt/${targetPath}`,
+        `${outputPath}/prebuilt/${targetPath}`,
+    ];
+}