Skip to content

Commit 2f0d2bd

Browse files
benfrybenfry
committed
fix dist scripts so that the name "1.0" can be used
1 parent 027613f commit 2f0d2bd

6 files changed

Lines changed: 80 additions & 37 deletions

File tree

‎build/linux/dist.sh‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
#!/bin/sh
22

3-
REVISION=`head -c 4 ../../todo.txt`
3+
#REVISION=`head -c 4 ../../todo.txt`
4+
REVISION=`head -1 ../../todo.txt | awk '{print $1}'`
5+
6+
if [ $1 ]
7+
then
8+
RELEASE=$1
9+
echo Creating Processing release $RELEASE...
10+
else
11+
RELEASE=$REVISION
12+
echo Creating Processing distribution for revision $REVISION...
13+
fi
414

515
ARCH=`uname -m`
616
if [ $ARCH != "i686" ]
@@ -11,8 +21,6 @@ fi
1121

1222
./make.sh
1323

14-
echo Creating linux distribution for revision $REVISION...
15-
1624
# remove any old boogers
1725
rm -rf processing
1826
rm -rf processing-*
@@ -67,11 +75,11 @@ find processing -name ".svn" -exec rm -rf {} 2> /dev/null ';'
6775

6876
# zip it all up for release
6977
echo Creating tarball and finishing...
70-
P5=processing-$REVISION
78+
P5=processing-$RELEASE
7179
mv processing $P5
7280

7381
tar cfz $P5.tgz $P5
7482
# nah, keep the new directory around
7583
#rm -rf $P5
7684

77-
#echo Done.
85+
echo Done.

‎build/macosx/dist.sh‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,22 @@
33

44
REVISION=`head -1 ../../todo.txt | awk '{print $1}'`
55

6+
if [ $1 ]
7+
then
8+
RELEASE=$1
9+
echo Creating Processing release $RELEASE...
10+
else
11+
RELEASE=$REVISION
12+
echo Creating Processing distribution for revision $REVISION...
13+
fi
14+
615
VERSIONED=`cat ../../app/src/processing/app/Base.java | grep $REVISION`
716
if [ -z "$VERSIONED" ]
817
then
918
echo Fix the revision number in Base.java
1019
exit
1120
fi
1221

13-
echo Creating P5 distribution for revision $REVISION...
14-
1522
# remove any unfinished builds or old builds
1623
rm -rf processing
1724
rm -rf Processing*
@@ -35,8 +42,6 @@ find work -name "CVS" -exec rm -rf {} ';' 2> /dev/null
3542
find work -name ".cvsignore" -exec rm -rf {} ';'
3643
find work -name ".svn" -exec rm -rf {} 2> /dev/null ';'
3744

38-
echo Done.
39-
4045

4146
# the following was adopted from the makefile by Remko Troncon:
4247
# http://el-tramo.be/guides/fancy-dmg
@@ -45,7 +50,7 @@ echo Creating disk image...
4550

4651
SOURCE_DIR="work"
4752
SOURCE_FILES="Processing.app"
48-
OUTPUT_DMG="processing-$REVISION"
53+
OUTPUT_DMG="processing-$RELEASE"
4954
WORK_DMG="working.dmg"
5055
WORK_DIR="working_dir"
5156

‎build/macosx/dist/Processing.app/Contents/Info.plist‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,15 @@
44
<dict>
55
<key>CFBundleName</key>
66
<string>Processing</string>
7+
8+
<!-- all these need to change for new releases -->
9+
<key>CFBundleGetInfoString</key>
10+
<string>1.0, Copyright © Ben Fry and Casey Reas</string>
711
<key>CFBundleVersion</key>
8-
<string>10.2</string>
12+
<string>1.0</string>
13+
<key>CFBundleShortVersionString</key>
14+
<string>1.0</string>
15+
916
<key>CFBundleAllowMixedLocalizations</key>
1017
<string>true</string>
1118
<key>CFBundleExecutable</key>
@@ -50,22 +57,33 @@
5057
<dict>
5158
<key>VMOptions</key>
5259
<string>-Xms128M -Xmx256M</string>
60+
5361
<key>MainClass</key>
5462
<string>processing.app.Base</string>
63+
5564
<key>JVMVersion</key>
5665
<string>1.5*</string>
66+
5767
<key>ClassPath</key>
58-
<!-- in 0149, removed /System/Library/Java because of problems -->
68+
<!-- In 0149, removed /System/Library/Java from the CLASSPATH because
69+
it can cause problems if users have installed weird files there.
70+
http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
5971
<string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar</string>
72+
6073
<key>Properties</key>
6174
<dict>
62-
<!-- pass the full path of Contents/Resources/Java to the PDE -->
75+
<!-- Pass the full path of Contents/Resources/Java to the PDE -->
6376
<key>javaroot</key>
6477
<string>$JAVAROOT</string>
65-
<!-- http://developer.apple.com/releasenotes/Java/java141/system_properties/chapter_4_section_1.html#//apple_ref/doc/uid/TP30000285 -->
66-
<!-- in release 0158, removing the menubar option and controlling it by a preference. -->
67-
<!-- <key>apple.laf.useScreenMenuBar</key>
68-
<string>true</string>-->
78+
79+
<!-- More properties can be found in http://developer.apple.com/releasenotes/Java/java141/system_properties/chapter_4_section_1.html#//apple_ref/doc/uid/TP30000285 -->
80+
81+
<!--
82+
In release 0158, removed the menubar option from the .app and instead controlling it from the preferences window. By default, the menu bar is inside the editor window because of the Apple Java bug.
83+
<key>apple.laf.useScreenMenuBar</key>
84+
<string>true</string>
85+
-->
86+
6987
<key>apple.awt.showGrowBox</key>
7088
<string>false</string>
7189
<key>com.apple.smallTabs</key>

‎build/windows/dist.sh‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
#!/bin/sh
22

3-
REVISION=`head -c 4 ../../todo.txt`
3+
#REVISION=`head -c 4 ../../todo.txt`
4+
REVISION=`head -1 ../../todo.txt | awk '{print $1}'`
5+
6+
if [ $1 ]
7+
then
8+
RELEASE=$1
9+
echo Creating Processing release $RELEASE...
10+
else
11+
RELEASE=$REVISION
12+
echo Creating Processing distribution for revision $REVISION...
13+
fi
414

515
# check to see if the version number in the app is correct
616
# so that mikkel doesn't kick my ass
@@ -13,9 +23,6 @@ fi
1323

1424
./make.sh
1525

16-
echo Creating P5 distribution for revision $REVISION...
17-
echo
18-
1926
# remove any old boogers
2027
rm -rf processing
2128
rm -rf processing-*
@@ -82,7 +89,7 @@ find processing -name ".svn" -exec rm -rf {} ';' 2> /dev/null
8289
# zip it all up for release
8390
echo Packaging standard release...
8491
echo
85-
P5=processing-$REVISION
92+
P5=processing-$RELEASE
8693
mv processing $P5
8794
zip -rq $P5.zip $P5
8895
# nah, keep the new directory around

‎core/todo.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
0161 core
22
X present on macosx causing strange flicker/jump while window opens
33
X using validate() for present mode, pack() otherwise
4-
4+
_ http://dev.processing.org/bugs/show_bug.cgi?id=1051
55

66
[ known problems ]
77

‎todo.txt‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
0161 pde
2+
X run javadoc, and upload to server
3+
X set background for disk image on macosx
4+
X fix dist scripts so that the name "1.0" can be used
25

36

4-
_ a new release (1.0.1) is available
5-
_ be more descriptive, use a second line in latest.txt
6-
_ maybe just include the full text of the update message there?
7-
87
_ write revisions.txt
98
_ update revisions.html
109
_ in 0149, removed /System/Library/Java
1110
_ http://dev.processing.org/bugs/show_bug.cgi?id=1045
1211
_ update known problems reference
1312
_ extendo thing for tabs
1413
_ strokeweight/cap
15-
_ set background for disk image on macosx
16-
_ fix dist scripts so that the name "1.0" can be used
1714
_ replace applet.html and applet-opengl.html
1815
_ update applet.html to point at java 6u10 with the new auto-update stuff
1916
_ also update applet on the home page to do the same
20-
_ run javadoc, and upload to server
17+
_ remove the bugs forum
2118
_ do we need to shore up server setup for 1.0 release pounding?
2219
_ what's the deal with disk space?
2320

21+
_ setup phplist
22+
_ delete the old announce list
23+
_ change signup instructions for announce list
24+
_ move the old logs off the server
25+
2426

2527
[ needs verification ]
2628

@@ -580,6 +582,9 @@ _ http://dev.processing.org/bugs/show_bug.cgi?id=1036
580582

581583
PDE / Editor
582584

585+
_ improve update check message "a new release (1.0.1) is available"
586+
_ be more descriptive, use a second line in latest.txt
587+
_ maybe just include the full text of the update message there?
583588
_ go through other sketch-opening menus to check for disappearing sketches
584589
_ deal with isManagingFocus() warning in the editor src
585590
_ should really be doing the 'right' thing with sketch file handling
@@ -708,12 +713,12 @@ _ http://dev.processing.org/bugs/show_bug.cgi?id=37
708713

709714
PDE / Editor Header
710715

711-
_ make some fancy extendo things because the tabs get too big
712-
_ either condense or popdown menu thingy
713-
_ http://dev.processing.org/bugs/show_bug.cgi?id=54
714-
_ key command for prev/next tab works, but not menu
715-
_ menu options are actually disabled because of inconsistency
716-
_ http://dev.processing.org/bugs/show_bug.cgi?id=1044
716+
2 _ make some fancy extendo things because the tabs get too big
717+
2 _ either condense or popdown menu thingy
718+
2 _ http://dev.processing.org/bugs/show_bug.cgi?id=54
719+
5 _ key command for prev/next tab works, but not menu
720+
5 _ menu options are actually disabled because of inconsistency
721+
5 _ http://dev.processing.org/bugs/show_bug.cgi?id=1044
717722

718723

719724
PDE / Editor Status
@@ -733,6 +738,7 @@ PDE / Export
733738

734739
_ when exporting to application (or applet) don't copy .java files from folder
735740
_ (they'll be copied as source files later)
741+
_ make .java files and friends go to correct locations on export (app)
736742
_ warn on export when people call their sketches things like Server
737743
_ warn if someone extends PApplet but mis-names the sketch
738744
_ or don't allow it to be exported
@@ -755,7 +761,6 @@ _ javadoc comment in a static mode app doesn't get moved to the top
755761
_ http://dev.processing.org/bugs/show_bug.cgi?id=924
756762
_ don't copy hidden files (.svn especially) on export/save as
757763
_ http://dev.processing.org/bugs/show_bug.cgi?id=761
758-
_ make .java files and friends go to correct locations on export (app)
759764

760765

761766
PDE / Find & Replace

0 commit comments

Comments
 (0)