Index: QuickWho.py ================================================================== --- QuickWho.py +++ QuickWho.py @@ -73,11 +73,11 @@ Tk.__init__(self, parent) try: self.tk.call('console', 'hide') except TclError: pass - self.setAppName('QuickWho', '6.2') + self.setAppName('QuickWho', '6.3') self.makeImages() if self.isAqua(): self.tk.call('package', 'require', 'tclservices') self.tk.call('package', 'require', 'cocoaprint') self.createcommand('::tk::mac::PerformService', self.runService) @@ -294,11 +294,11 @@ #aboutwindow def aboutWindow(self): messagebox.showinfo(title='About QuickWho', message='QuickWho: Domain Name Service', - icon='info', parent=self, detail='Version 6.2\n(c) 2017 WordTech Communications LLC') + icon='info', parent=self, detail='Version 6.3\n(c) 2018 WordTech Communications LLC') #draw the GUI def drawGUI(self): Index: buildapp ================================================================== --- buildapp +++ buildapp @@ -16,44 +16,142 @@ then rm -rf build fi -python3 setup.py py2app --includes Pmw - - - -mkdir dist/QuickWho.app/Contents/lib - -find dist/QuickWho.app -name "*.a" -exec rm -rf {} \; -find dist/QuickWho.app -name "*debug" -exec rm -rf {} \; -find dist/QuickWho.app -name "*.sh" -exec rm -rf {} \; +cat << EOT > Info.plist + + + + + CFBundleDevelopmentRegion + English + CFBundleDisplayName + QuickWho + CFBundleExecutable + _quickWho + CFBundleGetInfoString + QuickWho $1 + CFBundleIconFile + QuickWho.icns + CFBundleIdentifier + com.codebykevin.quickwho + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + QuickWho + CFBundlePackageType + APPL + CFBundleShortVersionString + $1 + CFBundleSignature + ???? + CFBundleVersion + $1 + LSApplicationCategoryType + public.app-category.utilities + LSArchitecturePriority + x86_64 + LSHasLocalizedDisplayName + + LSMinimumSystemVersion + 10.13 + LSMinimumSystemVersionByArchitecture + + x86_64 + 10.13 + + NSAppleScriptEnabled + YES + NSHighResolutionCapable + YES + NSHumanReadableCopyright + Copyright (c) 2018 WordTech Communications LLC + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + NSServices + + + NSMenuItem + + default + QuickWho: Display Domain Information + + NSMessage + provideService + NSPortName + QuickWho + NSSendTypes + + NSStringPboardType + + + + OSAScriptingDefinition + QuickWho.sdef + + +EOT + +gcc main.m -o _quickwho -framework Carbon -framework Cocoa + +mkdir dist +mkdir dist/QuickWho.app +mkdir dist/QuickWho.app/Contents +mkdir dist/QuickWho.app/Contents/MacOS +mkdir dist/QuickWho.app/Contents/Resources +mkdir dist/QuickWho.app/Contents/Frameworks + +cp Info.plist dist/QuickWho.app/Contents/Info.plist +cp _quickwho dist/QuickWho.app/Contents/MacOS/_quickwho +cp launcher dist/QuickWho.app/Contents/Resources/launcher +cp QuickWho.icns dist/QuickWho.app/Contents/Resources/QuickWho.icns +cp QuickWho.sdef dist/QuickWho.app/Contents/Resources/QuickWho.sdef +cp QuickWho.py dist/QuickWho.app/Contents/Resources/QuickWho.py +cp ToolTip.py dist/QuickWho.app/Contents/Resources/ToolTip.py + +#copy the frameworks +cp -R -f /Library/Frameworks/Tcl.framework dist/QuickWho.app/Contents/Frameworks/Tcl.framework +cp -R -f /Library/Frameworks/Tk.framework dist/QuickWho.app/Contents/Frameworks/Tk.framework +cp -R -f /Library/Frameworks/Python.framework dist/QuickWho.app/Contents/Frameworks/Python.framework +cp -f dist/QuickWho.app/Contents/Frameworks/Python.framework/Versions/3.6/Resources/Python.app/Contents/MacOS/Python dist/QuickWho.app/Contents/Resources/QuickWho +cp -f /usr/local/lib/libcrypto.42.dylib dist/QuickWho.app/Contents/Frameworks/libcrypto.42.dylib +cp -f /usr/local/lib/libssl.44.dylib dist/QuickWho.app/Contents/Frameworks/libssl.44.dylib #copy the supporting libraries for lib in scriptlibs/* do echo "Copying $lib library..." - cp -R -f $lib dist/QuickWho.app/Contents/lib + cp -R -f $lib dist/QuickWho.app/Contents/Frameworks/Tcl.framework/Versions/8.6/Resources/Scripts done #copy the supporting libraries for lib in maclibs/* do echo "Copying $lib library..." - cp -R -f $lib dist/QuickWho.app/Contents/lib + cp -R -f $lib dist/QuickWho.app/Contents/Frameworks/Tcl.framework/Versions/8.6/Resources/Scripts done + +find dist/QuickWho.app -name "*.a" -exec rm -rf {} \; +find dist/QuickWho.app -name "*debug" -exec rm -rf {} \; +find dist/QuickWho.app -name "*.sh" -exec rm -rf {} \; + +find dist/QuickWho.app -type f -name "*.so" -exec strip -x {} \; find dist/QuickWho.app -type f -name "*.so" -exec codesign --verbose --signature-size 9400 -f -s "Developer ID Application: Kevin Walzer" {} \; +find dist/QuickWho.app -type f -name "*.dylib" -exec strip -x {} \; find dist/QuickWho.app -type f -name "*.dylib" -exec codesign --verbose --signature-size 9400 -f -s "Developer ID Application: Kevin Walzer" {} \; codesign --verbose --signature-size 9400 -f -s "Developer ID Application: Kevin Walzer" dist/QuickWho.app/Contents/Frameworks/Tk.framework/Versions/8.6/Resources/Wish.app/Contents/MacOS/Wish codesign --verbose --signature-size 9400 -f -s "Developer ID Application: Kevin Walzer" dist/QuickWho.app/Contents/Frameworks/Tk.framework/Versions/Current codesign --verbose --signature-size 9400 -f -s "Developer ID Application: Kevin Walzer" dist/QuickWho.app/Contents/Frameworks/Tcl.framework/Versions/Current codesign --verbose --signature-size 9400 -f -s "Developer ID Application: Kevin Walzer" dist/QuickWho.app/Contents/Frameworks/Python.framework/Versions/Current -codesign --verbose --signature-size 9400 -f -s "Developer ID Application: Kevin Walzer" dist/QuickWho.app/Contents/MacOS/python +codesign --verbose --signature-size 9400 -f -s "Developer ID Application: Kevin Walzer" dist/QuickWho.app/Contents/MacOS/_quickwho xattr -cr dist/QuickWho.app codesign --signature-size 9400 -f -s "Developer ID Application: Kevin Walzer" --verbose=2 dist/QuickWho.app cp readme.txt dist/readme.txt @@ -82,8 +180,5 @@ #create archive of entire source tree tar cvfz QuickWho-$1.tgz QuickWho echo "Done." - - - ADDED launcher Index: launcher ================================================================== --- launcher +++ launcher @@ -0,0 +1,18 @@ +#!/bin/sh + +name=`basename "$0"` +tmp="$0" +tmp=`dirname "$tmp"` +tmp=`dirname "$tmp"` +bundle=`dirname "$tmp"` +bundle_contents="$bundle"/Contents +bundle_res="$bundle_contents"/Resources +bundle_frameworks="$bundle_contents"/Frameworks +python="$bundle_res"/QuickWho +main_script="$bundle_res"/QuickWho.py + +export DYLD_LIBRARY_PATH="$bundle_frameworks" +export DYLD_FRAMEWORK_PATH="$bundle_frameworks" + + +exec "$python" "$@" $main_script ADDED main.m Index: main.m ================================================================== --- main.m +++ main.m @@ -0,0 +1,24 @@ +#import +#import +#import +#import +#import +#import + +int main (int argc, const char * argv[]) { + + + NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; + + NSString *launchpath = [[NSBundle mainBundle] pathForResource:@"launcher" ofType:nil]; + + char cmd[50000]; + + [launchpath getCString:cmd maxLength:(sizeof cmd) encoding:NSUTF8StringEncoding]; + + system(cmd); + + [pool release]; + + +} Index: scriptlibs/machelp/help.txt ================================================================== --- scriptlibs/machelp/help.txt +++ scriptlibs/machelp/help.txt @@ -105,10 +105,14 @@ ------------------- title: QuickWho Version History alias: History +'''6.3 (February 24, 2018):''' + * Improved resizing of main window for efficient UI. + * Removal of console on Windows. + '''6.2 (May 1, 2017):''' * Improved scrolling performance, security support on macOS. * Improved security support on Windows. '''6.1 (March 1, 2017):''' @@ -192,12 +196,12 @@ '''The MIT License (MIT)''' QuickWho source code: [http://fossil.codebykevin.com/fossil.cgi/quickwho/] -Copyright (c) 2017 WordTech Communications LLC +Copyright (c) 2018 WordTech Communications LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Index: scriptlibs/softwareupdate/softwareupdate.tcl ================================================================== --- scriptlibs/softwareupdate/softwareupdate.tcl +++ scriptlibs/softwareupdate/softwareupdate.tcl @@ -4,11 +4,11 @@ #MIT license package provide softwareupdate 1.5 package require http -package require tls +package require tls ::http::register https 443 [list ::tls::socket -servername codebykevin.com -request 0 -require 0 -ssl2 0 -ssl3 0 -tls1 1] namespace eval softwareupdate {