Skip to content

Commit 824b634

Browse files
kintelkintel
authored
Merge pull request #171 from openscad/kintel-downloads
Simplified and made downloads more dynamic
2 parents 5d52d9a + ccc166c commit 824b634

10 files changed

+17
-205
lines changed

‎downloads.html‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131
<script>
3232
var fileinfo = {};
3333
</script>
34-
<script src="inc/mac_release_links.js"></script>
35-
<script src="inc/win_release_links.js"></script>
36-
<script src="inc/linux_release_links.js"></script>
37-
<script src="inc/src_release_links.js"></script>
38-
<script src="inc/rc_links.js"></script>
3934
<script>
4035
function setSnapshotFileInfo(key, name, size, url) {
4136
fileinfo[key + "_NAME"] = name;
@@ -55,11 +50,9 @@
5550
}
5651
});
5752
</script>
58-
<script type="text/javascript" src="https://files.openscad.org/snapshots/.snapshot_wasm.js"></script>
59-
<script type="text/javascript" src="https://files.openscad.org/snapshots/.snapshot_macos.js"></script>
60-
<script type="text/javascript" src="https://files.openscad.org/snapshots/.snapshot_win64.js"></script>
61-
<script type="text/javascript" src="https://files.openscad.org/snapshots/.snapshot_linux_x86_64.js"></script>
62-
<script type="text/javascript" src="https://files.openscad.org/snapshots/.snapshot_linux_aarch64.js"></script>
53+
<script src="inc/releases.js"></script>
54+
<script type="text/javascript" src="https://files.openscad.org/rc/.rc.js" onload="jQuery(function(){ jQuery('#rc').show(); jQuery('#nav-rc').show(); });"></script>
55+
<script type="text/javascript" src="https://files.openscad.org/snapshots/.snapshots.js"></script>
6356
</head>
6457
<body>
6558

@@ -119,7 +112,7 @@ <h1>Downloads</h1>
119112
<li><a href="#linux">Linux</a></li>
120113
<li><a href="#other-systems">Other Systems</a></li>
121114
<li><a href="#source-code">Source Code</a></li>
122-
<!--<li><a href="#rc">Release Candidates</a></li>-->
115+
<li id="nav-rc" style="display:none"><a href="#rc">Release Candidates</a></li>
123116
<li><a href="#docker">Docker</a></li>
124117
<li><a href="#snapshots">Development Snapshots</a></li>
125118
<li><a href="#priorreleases">Prior Releases</a></li>
@@ -340,8 +333,7 @@ <h3 id="SRC_RELEASE_NAME">OpenSCAD</h3></a>
340333
<p>You can also access the latest source code on github: <a href="https://github.com/openscad/openscad" target="_blank">openscad/openscad on github</a></p>
341334
</section>
342335

343-
<!--
344-
<section id="rc">
336+
<section id="rc" style="display:none">
345337
<h1>Release Candidates</h1>
346338
<p>Release Candidates are builds that contain all features that will be included in the next release and are intended
347339
to reach a wider audience for testing before the final release.
@@ -438,7 +430,6 @@ <h3 id="SRC_RC_NAME">OpenSCAD</h3>
438430
</div>
439431
</div>
440432
</section>
441-
-->
442433

443434
<section id="docker">
444435
<h1>Docker</h1>

‎inc/linux_release_links.js‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎inc/linux_snapshot_links.js‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎inc/mac_release_links.js‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎inc/mac_snapshot_links.js‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎inc/rc_links.js‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎inc/releases.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
setSnapshotFileInfo('MAC_RELEASE', 'OpenSCAD 2021.01', '27 MB', 'https://files.openscad.org/OpenSCAD-2021.01.dmg');
2+
3+
setSnapshotFileInfo('WIN32_RELEASE_INSTALLER', 'OpenSCAD 2021.01', '21 MB', 'https://files.openscad.org/OpenSCAD-2021.01-x86-32-Installer.exe');
4+
setSnapshotFileInfo('WIN32_RELEASE_ZIP', 'OpenSCAD 2021.01', '21 MB', 'https://files.openscad.org/OpenSCAD-2021.01-x86-32.zip');
5+
setSnapshotFileInfo('WIN64_RELEASE_INSTALLER', 'OpenSCAD 2021.01', '21 MB', 'https://files.openscad.org/OpenSCAD-2021.01-x86-64-Installer.exe');
6+
setSnapshotFileInfo('WIN64_RELEASE_ZIP', 'OpenSCAD 2021.01', '21 MB', 'https://files.openscad.org/OpenSCAD-2021.01-x86-64.zip');
7+
8+
setSnapshotFileInfo('LIN32_RELEASE', 'OpenSCAD 2021.01', 'N/A', 'N/A');
9+
setSnapshotFileInfo('LIN64_RELEASE', 'OpenSCAD 2021.01', '39 MB', 'https://files.openscad.org/OpenSCAD-2021.01-x86_64.AppImage');
10+
setSnapshotFileInfo('ARM64_RELEASE', 'OpenSCAD 2021.01', '43 MB', 'https://files.openscad.org/OpenSCAD-2021.01-aarch64.AppImage');
11+
12+
setSnapshotFileInfo('SRC_RELEASE', 'OpenSCAD 2021.01', '16 MB', 'https://files.openscad.org/openscad-2021.01.src.tar.gz');

‎inc/src_release_links.js‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎inc/win_release_links.js‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎inc/win_snapshot_links.js‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)