Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit b2092bb

Browse files
Release Managervbraun
Release Manager
authored andcommitted
Trac #17020: Update jmol to the latest version
Upstream tarball: http://sage.sagedev.org/home/vbraun/upstream/jmol-14.2 .4_2014.08.03.tar.bz2 URL: http://trac.sagemath.org/17020 Reported by: vbraun Ticket author(s): Jonathan Gutow, Volker Braun Reviewer(s): Karl-Dieter Crisman, Jonathan Gutow, Volker Braun
2 parents 2283698 + 1c39202 commit b2092bb

File tree

5 files changed

+211
-433
lines changed

5 files changed

+211
-433
lines changed

build/pkgs/jmol/SPKG.txt

+19-69
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
== Description ==
44

5-
This updates jar files necessary for Jmol
6-
to operate from the command line and the Notebook.
7-
It does not contain the Notebook javascript library
8-
jmol_lib.js or changes to Notebook or Sage code.
5+
This provides files necessary for Jmol(java) and JSmol
6+
(javascript) to operate from the command line and the
7+
Notebook. It does not contain the Notebook javascript
8+
library jmol_lib.js or changes to Notebook or Sage code.
99

1010
== License ==
1111

@@ -23,78 +23,28 @@ GPLv2+
2323

2424
== Dependencies ==
2525

26-
* Sage Notebook (sagenb)
26+
No build-time dependencies.
2727

28-
== Changelog ==
29-
=== jmol-12.3.27.p3 (Jonathan Gutow, Sept 15, 2012) ===
28+
The commandline jmol requires java at runtime.
3029

31-
* switch to #!/usr/bin/env bash in testjava.sh
30+
== Special Build Instructions ==
3231

33-
=== jmol-12.3.27.p2 (Jonathan Gutow, July 14, 2012) ===
32+
First, unpack the upstream release (actual version number will of
33+
course differ):
3434

35-
* Fix not exiting with code 1 when java not available.
35+
$ unzip ~/Download/Jmol-14.2.4_2014.08.03-binary.zip
36+
$ cd jmol-14.2.4_2014.08.03/
3637

37-
=== jmol-12.3.27.p1 (Jonathan Gutow, July 12, 2012) ===
38+
Extract and then delete the contained jsmol.zip
3839

39-
* update testjava.sh to check java versions (now requires
40-
versions 1.5 - 1.7)
40+
$ unzip jsmol.zip
41+
$ rm jsmol.zip
4142

42-
=== jmol-12.3.27.p0 (Jonathan Gutow, May 27, 2012) ===
43+
Delete unnecessary (?) files in subdirectories
4344

44-
* update to Jmol-12.3.27 included fixes to the headless JmolData.jar
45-
allowing it to generate images.
46-
* Adds testjava.sh to the jmol directory for checking if java
47-
is installed.
45+
$ rm -rf jsmol/data jsmol/php
4846

49-
=== jmol-12.2.21.p0 (Jonathan Gutow, April 8, 2012) ===
47+
Tar up the remaining files
5048

51-
* update to Jmol-12.2.21 includes updates to .jar files necessary
52-
for using a headless Jmol to generate static images server-side.
53-
54-
=== jmol-12.0.45.p4 (Jason Grout, February 4, 2012) ===
55-
56-
* make the SAGE_LOCAL/bin/jmol script executable
57-
58-
=== jmol-12.0.45.p3 (Dan Drake, Jason Grout, January 11, 2012) ===
59-
60-
* improvements to spkg-install and SPKG.txt.
61-
62-
=== jmol-12.0.45.p2 (Jonathan Gutow, July 18, 2011) ===
63-
64-
* added patched launch script jmol to spkg repository.
65-
66-
=== jmol-12.0.45.p1 (Jonathan Gutow, June 24, 2011) ===
67-
68-
* added signed applet to spkg and patched Jmol.js to allow on the fly
69-
switching to the signed applet.
70-
71-
=== jmol-12.0.45.p0 (Jonathan Gutow, June 17, 2011) ===
72-
73-
* refactored to more standard Sage spkg organization and
74-
naming. First package designed to be part of base install.
75-
76-
=== jmol-1.1.7 (Jonathan Gutow, June 15, 2011) ===
77-
78-
* for Flask notebook moves Jmol to SAGE_ROOT/local/share
79-
80-
=== jmol-1.1.6 (Jonathan Gutow, June 14, 2011) ===
81-
82-
* adds Jmol.help and sage.mnu back into appletweb directory. Updates
83-
Jmol to 12.0.45
84-
85-
=== jmol-1.1.5 (Jonathan Gutow, March 22, 2011) ===
86-
87-
* removes jmol_lib.js and notebook_lib.js so that they can be tracked
88-
using mercurial. This package now only updates Jmol.js and the
89-
JmolXXX.jar (binary) files to Jmol 12.0.35
90-
91-
=== jmol-1.1.4 (Jonathan Gutow, January 22, 2011) ===
92-
93-
* Fixes to jmol_lib.js to accommodate vocabulary changes in SAGE.
94-
95-
* updates to Jmol 12.0.30 which includes bug fixes to the script
96-
engine.
97-
98-
* (1.1.3)-Fixes to .spkg to accommodate change in notebook code in
99-
the SAGE directory. Code cleanup in jmol_lib.js and changes to
100-
allow updates to Jmol.js to have an effect.
49+
$ cd ..
50+
$ tar cjf jmol-14.2.4_2014.08.03.tar.bz2 jmol-14.2.4_2014.08.03/

build/pkgs/jmol/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=jmol-VERSION.tar.bz2
2-
sha1=e2a6ed355948a106c8d574922a7254b337e8f8a3
3-
md5=450d4a6d803177ef3257f250044eebf1
4-
cksum=372208435
2+
sha1=0496d92d75efb91c2b332f59be48c0ee6a12a314
3+
md5=acc6c39a4b7787f53657310e9252fbf9
4+
cksum=389669432

build/pkgs/jmol/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.3.27.p3
1+
14.2.4_2014.08.03

0 commit comments

Comments
 (0)