From: vampire0 <vam...@us...> - 2025-08-14 23:58:26
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "jEdit core". The branch, master has been updated via fba3ca4a5e830ac58f1725835bbc08dffc6d28d8 (commit) via 3491fde7de4763f583154ee6c8242a868123cd6e (commit) from 7c641f114efce9c21d335e9df8ea292f6f8f9f7c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit: https://sourceforge.net/p/jedit/jEdit/ci/fba3ca4a5e830ac58f1725835bbc08dffc6d28d8/ tree: https://sourceforge.net/p/jedit/jEdit/ci/fba3ca4a5e830ac58f1725835bbc08dffc6d28d8/tree/ commit fba3ca4a5e830ac58f1725835bbc08dffc6d28d8 Author: Björn Kautler <Bj...@Ka...> Date: Wed Jul 23 15:40:10 2025 +0200 Improve Windows Installer settings diff --git a/package-files/windows/win32installer.iss b/package-files/windows/win32installer.iss index db22d4827..fc92d703f 100644 --- a/package-files/windows/win32installer.iss +++ b/package-files/windows/win32installer.iss @@ -40,7 +40,7 @@ UninstallDisplayIcon={app}\jedit.exe UninstallDisplayName=jEdit @jedit.version@ VersionInfoCompany=Contributors VersionInfoCopyright=Copyright © 19...@cu...ar@ Contributors -VersionInfoDescription=Programmer's Text Editor +VersionInfoDescription=jEdit Installer VersionInfoTextVersion=@jedit.version@ VersionInfoVersion=@jedit.build.number@ WizardImageFile=@base.dir.for.innosetup@\icons\WindowsInstallerImage.bmp commit: https://sourceforge.net/p/jedit/jEdit/ci/3491fde7de4763f583154ee6c8242a868123cd6e/ tree: https://sourceforge.net/p/jedit/jEdit/ci/3491fde7de4763f583154ee6c8242a868123cd6e/tree/ commit 3491fde7de4763f583154ee6c8242a868123cd6e Author: Björn Kautler <Bj...@Ka...> Date: Thu Jul 3 23:14:35 2025 +0200 Improve macOS app bundle building diff --git a/README.SRC.txt b/README.SRC.txt index 62825eeae..311c3914b 100644 --- a/README.SRC.txt +++ b/README.SRC.txt @@ -99,7 +99,7 @@ General jEdit documentation can be found in the 'doc' directory. builds the Java installer in the dist-folder, configured in build.properties. - dist-mac build the macOS disk image (DMG-file) - builds the macOS internet-enabled disk image (DMG-file) if building on a box + builds the macOS disk image (DMG-file) if building on a box running macOS. If building on a box running something else, there will be a file called jedit<version_here>-dist-mac-finish.tar.bz2 in the dist-folder, configured in build.properties. Give that to someone running macOS and ask him @@ -107,7 +107,7 @@ General jEdit documentation can be found in the 'doc' directory. The only thing that needs to be installed for this final step is Apache Ant. - dist-mac-finish finish building the macOS disk image (DMG-file) on macOS - builds the macOS internet-enabled disk image (DMG-file) in the dist-folder, + builds the macOS disk image (DMG-file) in the dist-folder, configured in build.properties if building on a box running macOS. This target is normally only run directly, if someone just has to do the final step that was prepared by "dist-mac" or "dist". diff --git a/build.xml b/build.xml index bef8ae441..91d7fdb3d 100644 --- a/build.xml +++ b/build.xml @@ -1231,25 +1231,26 @@ applicationCategory="public.app-category.developer-tools" highResolutionCapable="true" supportsAutomaticGraphicsSwitching="true" + ignoreVerbose="true" mainclassname="org.gjt.sp.jedit.jEdit"> <classpath file="${dist.dir}/${jar.filename}"/> <option value="-Dapple.awt.textantialiasing=true"/> <option value="-Dapple.laf.useScreenMenuBar=true"/> <option value="-Dapple.awt.antialiasing=true"/> <argument value="-background"/> + <argument value="-reuseview"/> <bundledocument contentTypes="public.text" - extensions="*" icon="icons/file.icns" name="jEdit TEXT Document" role="Editor"/> + <bundledocument contentTypes="public.data, public.content" + icon="icons/file.icns" + name="jEdit Document" + role="Editor" + handlerRank="Alternate"/> + <arch name="arm64"/> + <arch name="x86_64"/> </appbundler:create> - <!-- part of work-around for https://github.com/TheInfiniteKind/appbundler/pull/88 --> - <copy file="package-files/osx/jedit" - todir="${dist.dir}/classes/mac/jEdit.app/Contents/MacOS/" - overwrite="true"/> - <!-- part of work-around for https://github.com/TheInfiniteKind/appbundler/pull/88 --> - <chmod file="${dist.dir}/classes/mac/jEdit.app/Contents/MacOS/jedit" - perm="+x"/> <copy todir="${dist.dir}/classes/mac/jEdit.app/Contents/Java/" overwrite="true"> <fileset dir="${dist.dir}" @@ -1261,20 +1262,11 @@ properties/** startup/**"/> </copy> - <replace file="${dist.dir}/classes/mac/jEdit.app/Contents/Info.plist" - encoding="UTF-8" - token="<key>IgnorePSN</key>" - value="<key>IgnoreVerbose</key><true/><key>IgnorePSN</key>" - failonnoreplacements="true"/> <copy todir="${dist.dir}/classes/mac/" overwrite="true"> <fileset dir="package-files/osx/" - includes=".background/**"/> + includes=".background/background.png"/> </copy> - <delete failonerror="false"> - <fileset dir="${dist.dir}" - includes="*${mac.disk.image.filename}"/> - </delete> <!-- work-around for https://github.com/actions/runner-images/issues/7522 --> <retry retrycount="3" retrydelay="1000"> <exec executable="hdiutil" @@ -1282,51 +1274,75 @@ <arg value="create"/> <arg value="-volname"/> <arg value="jEdit"/> + <arg value="-format"/> + <arg value="UDRW"/> + <arg value="-fs"/> + <arg value="HFS+"/> <arg value="-srcfolder"/> <arg file="${dist.dir}/classes/mac"/> - <arg file="${dist.dir}/orig-${mac.disk.image.filename}"/> + <arg value="-ov"/> + <arg file="${dist.dir}/udrw-${mac.disk.image.filename}"/> </exec> </retry> - <exec executable="hdiutil" - failonerror="true"> - <arg value="convert"/> - <arg file="${dist.dir}/orig-${mac.disk.image.filename}"/> - <arg value="-format"/> - <arg value="UDRW"/> - <arg value="-o"/> - <arg file="${dist.dir}/udrw-${mac.disk.image.filename}"/> - </exec> + <fail message="The mount point /Volumes/jEdit is occupied currently"> + <condition> + <resourceexists> + <file file="/Volumes/jEdit"/> + </resourceexists> + </condition> + </fail> <exec executable="hdiutil" failonerror="true"> <arg value="attach"/> + <arg value="-readwrite"/> <arg file="${dist.dir}/udrw-${mac.disk.image.filename}"/> </exec> + <fail message="The mount point /Volumes/jEdit is not found"> + <condition> + <not> + <resourceexists> + <file file="/Volumes/jEdit"/> + </resourceexists> + </not> + </condition> + </fail> <exec executable="ln" failonerror="true"> <arg value="-sF"/> <arg file="/Applications"/> - <arg file="/Volumes/jEdit/"/> + <arg file="/Volumes/jEdit/Applications"/> + </exec> + <exec executable="osascript" + failonerror="true"> + <arg file="package-files/osx/set-background.scpt"/> + <arg value="jEdit"/> <!-- volumeName --> + <arg value="200"/> <!-- windowX --> + <arg value="200"/> <!-- windowY --> + <arg value="512"/> <!-- windowWidth --> + <arg value="648"/> <!-- windowHeight (image height + 28) --> + <arg value="130"/> <!-- iconSize --> + <arg value=".background:background.png"/> <!-- backgroundImage --> + <arg value="jEdit"/> <!-- appName --> + <arg value="111"/> <!-- appIconX --> + <arg value="192"/> <!-- appIconY --> + <arg value="401"/> <!-- appFolderX --> + <arg value="192"/> <!-- appFolderY --> </exec> - <copy file="package-files/osx/DS_Store" - tofile="/Volumes/jEdit/.DS_Store" - overwrite="true"/> <exec executable="hdiutil" failonerror="true"> <arg value="detach"/> <arg file="/Volumes/jEdit"/> <arg value="-force"/> </exec> - <copy file="${dist.dir}/udrw-${mac.disk.image.filename}" - tofile="${dist.dir}/udrw-copy-${mac.disk.image.filename}" - overwrite="true"/> <exec executable="hdiutil" failonerror="true"> <arg value="convert"/> - <arg file="${dist.dir}/udrw-copy-${mac.disk.image.filename}"/> + <arg file="${dist.dir}/udrw-${mac.disk.image.filename}"/> <arg value="-format"/> <arg value="UDZO"/> <arg value="-imagekey"/> <arg value="zlib-level=9"/> + <arg value="-ov"/> <arg value="-o"/> <arg file="${dist.dir}/${mac.disk.image.filename}"/> </exec> diff --git a/ivy.xml b/ivy.xml index 613838529..5a2718ac9 100644 --- a/ivy.xml +++ b/ivy.xml @@ -94,6 +94,6 @@ <dependency org="com.google.code.findbugs" name="jsr305" rev="3.0.2"/> - <dependency org="com.evolvedbinary.appbundler" name="appbundler" rev="1.3.0" conf="appbundler"/> + <dependency org="com.evolvedbinary.appbundler" name="appbundler" rev="1.3.1" conf="appbundler"/> </dependencies> </ivy-module> diff --git a/package-files/os2/jedit.cmd b/package-files/os2/jedit.cmd index f14e551d5..385045173 100644 --- a/package-files/os2/jedit.cmd +++ b/package-files/os2/jedit.cmd @@ -2,7 +2,7 @@ * Christoph vogt (ch...@gm...) * Gili Tzabari (ju...@bb...) * PLATFORM: OS/2, eCS - * + * * Used to run JEdit 3.1 */ @@ -16,7 +16,7 @@ end if (rc = -2) then say "Unexpected response to JAVA -VERSION. Assuming newest version is being used." -arguments = "-settings=%HOME%\.jedit -server=%HOME%\.jedit\server" +arguments = "-settings=%HOME%\.jedit -server=%HOME%\.jedit\server -reuseview" jedit_dir = GetExecPath() if (iMajor = 1 & iMid <= 1) then @@ -48,7 +48,7 @@ do while i > cQueued pull sStr if (pos("JAVA VERSION ", sStr) > 0) | (pos("JAVA.EXE VERSION ", sStr) > 0) then do - do while(queued() > 0) + do while(queued() > 0) pull sStrIngore; /* flush input stream */ end parse var sStr sStuff '"'iMajor'.'iMid'.'iMinor'"' @@ -70,4 +70,4 @@ parse source result parse var result 'OS/2 ' dummy result /* Get full path of script */ result=filespec("drive", result) || filespec("path", result) /* strip away filename */ result=substr(result, 1, length(result)-1) /* remove backslash */ -return result \ No newline at end of file +return result diff --git a/package-files/osx/.background/background.png b/package-files/osx/.background/background.png index 96ec3cc02..baddb0189 100644 Binary files a/package-files/osx/.background/background.png and b/package-files/osx/.background/background.png differ diff --git a/package-files/osx/.background/background.svg b/package-files/osx/.background/background.svg new file mode 100644 index 000000000..8d368503c --- /dev/null +++ b/package-files/osx/.background/background.svg @@ -0,0 +1,274 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="512" + height="620" + viewBox="0 0 135.46666 164.04165" + version="1.1" + id="svg1" + inkscape:version="1.4 (86a8ad7, 2024-10-11)" + sodipodi:docname="background.svg" + xml:space="preserve" + inkscape:export-filename="background.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview + id="namedview1" + pagecolor="#ffffff" + bordercolor="#999999" + borderopacity="1" + inkscape:showpageshadow="0" + inkscape:pageopacity="0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + inkscape:document-units="px" + inkscape:zoom="1.4142136" + inkscape:cx="319.96581" + inkscape:cy="276.12519" + inkscape:window-width="2560" + inkscape:window-height="1369" + inkscape:window-x="2552" + inkscape:window-y="161" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + showgrid="false" + showguides="true"><inkscape:grid + id="grid9" + units="mm" + originx="-39.6875" + originy="-39.6875" + spacingx="0.26458333" + spacingy="0.26458334" + empcolor="#3f3fff" + empopacity="0.25098039" + color="#3f3fff" + opacity="0.1254902" + empspacing="5" + enabled="true" + visible="false" /></sodipodi:namedview><defs + id="defs1"><marker + style="overflow:visible" + id="marker21" + refX="-0.25" + refY="0" + orient="auto-start-reverse" + inkscape:stockid="Concave triangle arrow" + markerWidth="0.40000001" + markerHeight="0.5" + viewBox="0 0 1 1" + inkscape:isstock="true" + inkscape:collect="always" + preserveAspectRatio="none"><path + transform="scale(0.7)" + d="M -2,-4 9,0 -2,4 c 2,-2.33 2,-5.66 0,-8 z" + style="fill:context-stroke;fill-rule:evenodd;stroke:none" + id="path21" /></marker><rect + x="235.65237" + y="500.67786" + width="405.24069" + height="234.44379" + id="rect16" /><linearGradient + id="linearGradient3" + inkscape:collect="always"><stop + style="stop-color:#76aced;stop-opacity:1;" + offset="0" + id="stop5" /><stop + style="stop-color:#1377ed;stop-opacity:1;" + offset="1" + id="stop4" /></linearGradient><radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3" + id="radialGradient5" + cx="107.42083" + cy="108.47916" + fx="107.42083" + fy="108.47916" + r="96.572914" + gradientUnits="userSpaceOnUse" /><clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath9"><rect + style="display:inline;opacity:1;fill:#ff0000;fill-opacity:0.5;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:34.76;stroke-opacity:0.5" + id="rect9" + width="135.46666" + height="137.58333" + x="39.6875" + y="39.6875" /></clipPath></defs><g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + style="display:inline" + transform="translate(-39.6875,-39.687499)"><circle + style="display:inline;fill:url(#radialGradient5);fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:34.76" + id="path3" + cx="107.42083" + cy="108.47916" + r="96.572914" + clip-path="url(#clipPath9)" + mask="none" + inkscape:label="Background" + inkscape:export-filename="background.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" + transform="matrix(0.99999999,0,0,1.1923077,0,-7.6322127)" /><text + xml:space="preserve" + style="font-size:7.9375px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="55.46793" + y="124.32063" + id="text11-8" + inkscape:label="this ..."><tspan + sodipodi:role="line" + id="tspan11-2" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.9375px;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px" + x="55.46793" + y="124.32063">this ...</tspan></text><text + xml:space="preserve" + style="font-size:7.9375px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="124.19759" + y="124.32063" + id="text11-8-1" + inkscape:label="... to here"><tspan + sodipodi:role="line" + id="tspan11-2-7" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.9375px;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px" + x="124.19759" + y="124.32063">... to here</tspan></text><path + style="display:inline;opacity:0.5;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.23334;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker21);paint-order:normal" + d="m 98.277773,90.588947 h 7.194767" + id="path17" + sodipodi:nodetypes="cc" + inkscape:label="Arrow" /><text + xml:space="preserve" + style="font-size:13.4056px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="91.734055" + y="62.043446" + id="text11" + inkscape:label="Drag"><tspan + sodipodi:role="line" + id="tspan11" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.4056px;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px" + x="91.734055" + y="62.043446">Drag</tspan></text><text + xml:space="preserve" + transform="matrix(0.26458333,0,0,0.26458333,-8.5459921,-0.97375291)" + id="text16" + style="font-size:18.6667px;line-height:135%;font-family:sans-serif;text-align:justify;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;direction:ltr;white-space:pre;shape-inside:url(#rect16);display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="0" + y="0" + inkscape:label="AFter installing"><tspan + x="235.65234" + y="518.64127" + id="tspan2"><tspan + dx="0 0 0 0 0 0 1.9880075 0 0 0 0 0 0 0 0 0 0 1.9880075 0 0 0 0 0 0 1.9880075 0 0 0 0 0 0 1.9880228 0 0 0 0 0 0 0 0 0 0 1.9880228" + style="font-weight:bold;line-height:135%;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS Bold';fill:#ffffff;stroke:none" + id="tspan1">After installing jEdit, please Ctrl+Click the </tspan></tspan><tspan + x="235.65234" + y="544.65262" + id="tspan4"><tspan + dx="0 0 0 0 0 0 0 0 0 0 0 0 4.4690027 0 0 4.4690104 0 0 0 0 4.4690104 0 0 0 0 0 0 0 0 0 0 0 0 4.4690104 0 0 0 0 0 0 4.4690104" + style="font-weight:bold;line-height:135%;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS Bold';fill:#ffffff;stroke:none" + id="tspan3">application in your Applications Folder and </tspan></tspan><tspan + x="235.65234" + y="570.66397" + id="tspan6"><tspan + style="font-weight:bold;line-height:135%;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS Bold';fill:#ffffff;stroke:none" + id="tspan5">select "Open". +</tspan></tspan><tspan + x="235.65234" + y="596.67532" + id="tspan8"><tspan + dx="0 0 0 5.8579111 0 0 0 0 0 5.8579111 0 0 0 5.8579187 0 0 0 5.8579111 0 0 0 0 5.8579111 0 0 0 0 5.8578959 0 0 0 0 0 0 5.8578959 0 0 5.8578959" + style="font-weight:bold;line-height:135%;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS Bold';fill:#ffffff;stroke:none" + id="tspan7">If jEdit did not open now, please go to </tspan></tspan><tspan + x="235.65234" + y="622.68668" + id="tspan10"><tspan + dx="0 0 0 0 0 11.140889 0 0 0 0 0 0 0 0 11.140885 0 11.140885 0 0 0 0 0 0 0 0 0 11.140885 0 0 0 0 0 0 0 0 11.140885" + style="font-weight:bold;line-height:135%;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS Bold';fill:#ffffff;stroke:none" + id="tspan9">your "Privacy & Security" settings and </tspan></tspan><tspan + x="235.65234" + y="648.69803" + id="tspan13"><tspan + style="font-weight:bold;line-height:135%;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS Bold';fill:#ffffff;stroke:none" + id="tspan12">select "Open Anyway" there. +</tspan></tspan><tspan + x="235.65234" + y="674.70938" + id="tspan15"><tspan + dx="0 0 0 0 0 0.38224506 0 0 0.38224888 0 0 0 0 0 0 0 0 0 0.38224888 0 0 0 0.38223362 0 0 0 0 0.38223362 0 0 0 0 0 0.38224888 0 0 0 0 0 0.38224888" + style="font-weight:bold;line-height:135%;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS Bold';fill:#ffffff;stroke:none" + id="tspan14">This is necessary one time only. After this, </tspan></tspan><tspan + x="235.65234" + y="700.72073" + id="tspan18"><tspan + dx="0 0 0 0 10.6724 0 0 0 10.672402 0 0 0 0 0 0 0 0 0 0 0 0 10.672395 0 0 0 10.672395 0 0 0 0 0 0 0 0 0 0 0 10.672379" + style="font-weight:bold;line-height:135%;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS Bold';fill:#ffffff;stroke:none" + id="tspan17">you can double-click the application as </tspan></tspan><tspan + x="235.65234" + y="726.73209" + id="tspan20"><tspan + style="font-weight:bold;line-height:135%;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS Bold';fill:#ffffff;stroke:none" + id="tspan19">usual.</tspan></tspan></text></g><g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="Icons" + style="display:inline" + transform="translate(-39.6875,-39.687499)"><g + id="g24" + transform="translate(0,3.2764572)"><g + id="g21" + transform="translate(0.52093251,-0.09925874)" + inkscape:label="Applicaton Label"><rect + style="opacity:0.5;fill:#ffff00;fill-opacity:0.5;stroke:none;stroke-width:4.23332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:34.76;stroke-opacity:1;paint-order:normal" + id="rect21-2-4-3-1-9" + width="34.395832" + height="3.1140108" + x="-162.4624" + y="-107.72369" + transform="scale(-1)" /><rect + style="opacity:0.5;fill:#ffff00;fill-opacity:0.5;stroke:none;stroke-width:4.23332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:34.76;stroke-opacity:1;paint-order:normal" + id="rect21-2-4-3-1-4-3" + width="34.395832" + height="3.1140108" + x="-162.4624" + y="-114.19791" + transform="scale(-1)" /></g><rect + style="opacity:0.5;fill:#ff0000;fill-opacity:0.490783;stroke:none;stroke-width:4.23332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:34.76;stroke-opacity:1;paint-order:normal" + id="rect21-2-4" + width="34.395832" + height="34.395832" + x="-162.98334" + y="-104.51041" + transform="scale(-1)" + inkscape:label="Application Icon" /></g><g + id="g25" + transform="translate(0,3.2764572)"><g + id="g22" + inkscape:label="jEdit Label" + transform="translate(-0.52916743)"><rect + style="opacity:0.5;fill:#ffff00;fill-opacity:0.5;stroke:none;stroke-width:4.23332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:34.76;stroke-opacity:1;paint-order:normal" + id="rect21-2-4-3-1" + width="34.395832" + height="3.1140108" + x="-86.783333" + y="-107.62444" + transform="scale(-1)" /><rect + style="opacity:0.5;fill:#ffff00;fill-opacity:0.5;stroke:none;stroke-width:4.23332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:34.76;stroke-opacity:1;paint-order:normal" + id="rect21-2-4-3-1-4" + width="34.395832" + height="3.1140108" + x="-86.783333" + y="-114.09866" + transform="scale(-1)" /></g><rect + style="opacity:0.5;fill:#ff0000;fill-opacity:0.490783;stroke:none;stroke-width:4.23332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:34.76;stroke-opacity:1;paint-order:normal" + id="rect21-2-4-3" + width="34.395832" + height="34.395832" + x="-86.254166" + y="-104.51041" + transform="scale(-1)" + inkscape:label="jEdit Icon" /></g></g></svg> diff --git a/package-files/osx/DS_Store b/package-files/osx/DS_Store deleted file mode 100644 index 74707f330..000000000 Binary files a/package-files/osx/DS_Store and /dev/null differ diff --git a/package-files/osx/jedit b/package-files/osx/jedit deleted file mode 100644 index ce982e7c4..000000000 Binary files a/package-files/osx/jedit and /dev/null differ diff --git a/package-files/osx/set-background.scpt b/package-files/osx/set-background.scpt new file mode 100644 index 000000000..a020a483b --- /dev/null +++ b/package-files/osx/set-background.scpt @@ -0,0 +1,25 @@ +on run(volumeName, windowX, windowY, windowWidth, windowHeight, iconSize, backgroundImage, appName, appIconX, appIconY, appFolderX, appFolderY) + tell application "Finder" + tell disk volumeName + open + set backgroundImage to file backgroundImage + tell its container window + set its current view to icon view + set its toolbar visible to false + set its statusbar visible to false + set its bounds to {windowX, windowY, windowX + windowWidth, windowY + windowHeight} + tell its icon view options + set its arrangement to not arranged + set its icon size to iconSize + set its background picture to backgroundImage + end tell + set position of item (appName & ".app") of it to {appIconX, appIconY} + set position of item "Applications" of it to {appFolderX, appFolderY} + end tell + close + open + update without registering applications + delay 2 + end tell + end tell +end run ----------------------------------------------------------------------- Summary of changes: README.SRC.txt | 4 +- build.xml | 88 +++++---- ivy.xml | 2 +- package-files/os2/jedit.cmd | 8 +- package-files/osx/.background/background.png | Bin 159959 -> 123469 bytes package-files/osx/.background/background.svg | 274 +++++++++++++++++++++++++++ package-files/osx/DS_Store | Bin 15364 -> 0 bytes package-files/osx/jedit | Bin 157079 -> 0 bytes package-files/osx/set-background.scpt | 25 +++ package-files/windows/win32installer.iss | 2 +- 10 files changed, 359 insertions(+), 44 deletions(-) create mode 100644 package-files/osx/.background/background.svg delete mode 100644 package-files/osx/DS_Store delete mode 100644 package-files/osx/jedit create mode 100644 package-files/osx/set-background.scpt hooks/post-receive -- jEdit core |