| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1055,47 +1055,62 @@ | |||
| 1055 | 1055 | </target> | |
| 1056 | 1056 | ||
| 1057 | 1057 | ||
| 1058 | - <!-- Target to create the icons... putting this in here rather than docs. | ||
| 1059 | - For OS X (though Linux might work), not intended for general use, | ||
| 1060 | - because it requires things like iconutil (on OS X) or ImageMagick's | ||
| 1061 | - convert tool (primarily in *nix environments). --> | ||
| 1062 | - <target name="icons"> | ||
| 1063 | - | ||
| 1064 | - <!-- create pde.iconset for Mac OS X --> | ||
| 1065 | - <property name="icon.src" value="shared/lib/icons" /> | ||
| 1066 | - <property name="icon.set" value="/tmp/pde.iconset" /> | ||
| 1058 | + <!-- bundle a bunch of PNGs into an OS X iconset --> | ||
| 1059 | + <target name="iconset"> | ||
| 1067 | 1060 | <mkdir dir="${icon.set}" /> | |
| 1061 | + <!--<echo message="root = ${icon.root} / set = ${icon.set}" />--> | ||
| 1068 | 1062 | ||
| 1069 | - <copy file="${icon.src}/pde-16.png" | ||
| 1063 | + <copy file="${icon.root}-16.png" | ||
| 1070 | 1064 | tofile="${icon.set}/icon_16x16.png" /> | |
| 1071 | - <copy file="${icon.src}/pde-32.png" | ||
| 1065 | + <copy file="${icon.root}-32.png" | ||
| 1072 | 1066 | tofile="${icon.set}/icon_16x16@2x.png" /> | |
| 1073 | 1067 | ||
| 1074 | - <copy file="${icon.src}/pde-32.png" | ||
| 1068 | + <copy file="${icon.root}-32.png" | ||
| 1075 | 1069 | tofile="${icon.set}/icon_32x32.png" /> | |
| 1076 | - <copy file="${icon.src}/pde-64.png" | ||
| 1070 | + <copy file="${icon.root}-64.png" | ||
| 1077 | 1071 | tofile="${icon.set}/icon_32x32@2x.png" /> | |
| 1078 | 1072 | ||
| 1079 | - <copy file="${icon.src}/pde-128.png" | ||
| 1073 | + <copy file="${icon.root}-128.png" | ||
| 1080 | 1074 | tofile="${icon.set}/icon_128x128.png" /> | |
| 1081 | - <copy file="${icon.src}/pde-256.png" | ||
| 1075 | + <copy file="${icon.root}-256.png" | ||
| 1082 | 1076 | tofile="${icon.set}/icon_128x128@2x.png" /> | |
| 1083 | 1077 | ||
| 1084 | - <copy file="${icon.src}/pde-256.png" | ||
| 1078 | + <copy file="${icon.root}-256.png" | ||
| 1085 | 1079 | tofile="${icon.set}/icon_256x256.png" /> | |
| 1086 | - <copy file="${icon.src}/pde-512.png" | ||
| 1080 | + <copy file="${icon.root}-512.png" | ||
| 1087 | 1081 | tofile="${icon.set}/icon_256x256@2x.png" /> | |
| 1088 | 1082 | ||
| 1089 | - <copy file="${icon.src}/pde-512.png" | ||
| 1083 | + <copy file="${icon.root}-512.png" | ||
| 1090 | 1084 | tofile="${icon.set}/icon_512x512.png" /> | |
| 1091 | - <copy file="${icon.src}/pde-1024.png" | ||
| 1085 | + <copy file="${icon.root}-1024.png" | ||
| 1092 | 1086 | tofile="${icon.set}/icon_512x512@2x.png" /> | |
| 1093 | 1087 | ||
| 1094 | - <exec executable="iconutil"> | ||
| 1095 | - <arg line="-c icns -o macosx/processing.icns ${icon.set}" /> | ||
| 1088 | + <exec executable="iconutil" logError="true"> | ||
| 1089 | + <arg line="-c icns -o ${icon.icns} ${icon.set}" /> | ||
| 1096 | 1090 | </exec> | |
| 1097 | 1091 | ||
| 1098 | 1092 | <delete dir="${icon.set}" /> | |
| 1093 | + </target> | ||
| 1094 | + | ||
| 1095 | + | ||
| 1096 | + <!-- Target to create the icons... putting this in here rather than docs. | ||
| 1097 | + For OS X (though Linux might work), not intended for general use, | ||
| 1098 | + because it requires things like iconutil (on OS X) or ImageMagick's | ||
| 1099 | + convert tool (primarily in *nix environments). --> | ||
| 1100 | + <target name="icons"> | ||
| 1101 | + <property name="icon.set" value="/tmp/pde.iconset" /> | ||
| 1102 | + | ||
| 1103 | + <!-- create iconset for the PDE application for Mac OS X --> | ||
| 1104 | + <antcall target="iconset"> | ||
| 1105 | + <param name="icon.root" value="shared/lib/icons/pde" /> | ||
| 1106 | + <param name="icon.icns" value="macosx/processing.icns" /> | ||
| 1107 | + </antcall> | ||
| 1108 | + | ||
| 1109 | + <!-- create iconset for exported sketch on Mac OS X --> | ||
| 1110 | + <antcall target="iconset"> | ||
| 1111 | + <param name="icon.root" value="../core/src/icon/icon" /> | ||
| 1112 | + <param name="icon.icns" value="../java/application/sketch.icns" /> | ||
| 1113 | + </antcall> | ||
| 1099 | 1114 | ||
| 1100 | 1115 | <!-- Create .ico for the PDE itself | |
| 1101 | 1116 | https://msdn.microsoft.com/en-us/library/dn742485.aspx | |
@@ -1107,6 +1122,11 @@ | |||
| 1107 | 1122 | <exec executable="convert" dir="shared/lib/icons"> | |
| 1108 | 1123 | <arg line="pde-16.png pde-32.png pde-48.png pde-64.png pde-256.png ../../../windows/application.ico" /> | |
| 1109 | 1124 | </exec> | |
| 1125 | + | ||
| 1126 | + <!-- Create .ico for exported Java applications --> | ||
| 1127 | + <exec executable="convert" dir="../core/src/icon"> | ||
| 1128 | + <arg line="icon-16.png icon-32.png icon-48.png icon-64.png icon-256.png ../../../java/application/sketch.ico" /> | ||
| 1129 | + </exec> | ||
| 1110 | 1130 | </target> | |
| 1111 | 1131 | ||
| 1112 | 1132 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -9,7 +9,7 @@ X merged list of sizes: 16, 24, 32, 48, 64, 256 | |||
| 9 | 9 | X Linux version of updated icon | |
| 10 | 10 | X handled with the .desktop file, nothing has changed for the file location | |
| 11 | 11 | X add larger icons to core folder | |
| 12 | - _ update export icons in java/application (export.icns and export.ico) | ||
| 12 | + X update export icons in java/application (export.icns and export.ico) | ||
| 13 | 13 | ||
| 14 | 14 | fixed earlier | |
| 15 | 15 | X Can't set Breakpoint from the Breakpoint bar at the side | |
| Back | FazBrowse Home | New Git URL |
0 commit comments