[kismac] [binaervarianz] r151 - in trunk: . KisMAC.xcodeproj Sources/Controller
- From: svn@xxxxxxxxxxxxxxxx
- To: kismac@xxxxxxxxxxxxx
- Date: Thu, 25 May 2006 16:42:44 +0200
Author: gkruse
Date: 2006-05-25 16:42:44 +0200 (Thu, 25 May 2006)
New Revision: 151
Modified:
trunk/CHANGES
trunk/KisMAC.xcodeproj/project.pbxproj
trunk/Sources/Controller/ScanControllerScriptable.m
Log:
Fixed path issue in AS KML Export
Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2006-05-25 03:28:40 UTC (rev 150)
+++ trunk/CHANGES 2006-05-25 14:42:44 UTC (rev 151)
@@ -1,3 +1,5 @@
+R151: - Fix path issure in KML export AppleScript
+
R150: - Fix compile on xCode 2.3
R149: - added export KML to script library to support "Realtime" export of kml
Modified: trunk/KisMAC.xcodeproj/project.pbxproj
===================================================================
--- trunk/KisMAC.xcodeproj/project.pbxproj 2006-05-25 03:28:40 UTC (rev
150)
+++ trunk/KisMAC.xcodeproj/project.pbxproj 2006-05-25 14:42:44 UTC (rev
151)
@@ -477,48 +477,6 @@
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */;
};
/* End PBXBuildFile section */
-/* Begin PBXBuildStyle section */
- 4A9504CCFFE6A4B311CA0CBA /* Development */ = {
- isa = PBXBuildStyle;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- DEBUGGING_SYMBOLS = YES;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = KisMAC_Prefix.pch;
- OPTIMIZATION_CFLAGS = "-O0";
- OTHER_CFLAGS = (
- "-mcpu=G3",
- "-force_cpusubtype_ALL",
- );
- ZERO_LINK = YES;
- };
- name = Development;
- };
- 4A9504CDFFE6A4B311CA0CBA /* Deployment */ = {
- isa = PBXBuildStyle;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_ENABLE_OBJC_EXCEPTIONS = YES;
- GCC_FAST_OBJC_DISPATCH = YES;
- GCC_PRECOMPILE_PREFIX_HEADER = NO;
- GCC_PREFIX_HEADER = "";
- GCC_UNROLL_LOOPS = YES;
- OTHER_CFLAGS = (
- "-mcpu=G3",
- "-force_cpusubtype_ALL",
- );
- ZERO_LINK = NO;
- };
- name = Deployment;
- };
-/* End PBXBuildStyle section */
-
/* Begin PBXCopyFilesBuildPhase section */
008ACFE107C397B700A76ADA /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
@@ -1683,61 +1641,11 @@
);
buildRules = (
);
- buildSettings = {
- FRAMEWORK_SEARCH_PATHS = (
- "$(SRCROOT)/Subprojects/files",
-
"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
- "$(SRCROOT)/UnitTest",
- );
- GCC_ENABLE_OBJC_EXCEPTIONS = YES;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER =
"$(SYSTEM_LIBRARY_DIR)/Frameworks/Foundation.framework/Headers/Foundation.h";
- GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = NO;
- INFOPLIST_FILE = "KisMACUnitTest-Info.plist";
- INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
- OTHER_CFLAGS = "";
- OTHER_LDFLAGS = (
- "-framework",
- Foundation,
- );
- OTHER_REZFLAGS = "";
- PRODUCT_NAME = KisMACUnitTest;
- SECTORDER_FLAGS = "";
- WARNING_CFLAGS = "-Wmost";
- };
dependencies = (
);
name = KisMACUnitTest;
productName = KisMACUnitTest;
productReference = 008AC9C007C3889400A76ADA /*
KisMACUnitTest.bundle */;
- productSettingsXML = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"
\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\";>
-<plist version=\"1.0\">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>KisMACUnitTest</string>
- <key>CFBundleGetInfoString</key>
- <string></string>
- <key>CFBundleIconFile</key>
- <string></string>
- <key>CFBundleIdentifier</key>
- <string>com.MySoftwareCompany.KisMACUnitTest</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string></string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1.0.0d1</string>
-</dict>
-</plist>
-";
productType = "com.apple.product-type.bundle";
};
8D1107260486CEB800E47090 /* KisMAC */ = {
@@ -1752,40 +1660,6 @@
);
buildRules = (
);
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- FRAMEWORK_SEARCH_PATHS = (
- "$(SRCROOT)/Subprojects/files",
-
"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
- "$(SRCROOT)/UnitTest",
- );
- GCC_ENABLE_OBJC_EXCEPTIONS = YES;
- GCC_ENABLE_TRIGRAPHS = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = KisMAC_Prefix.pch;
- GCC_USE_GCC3_PFE_SUPPORT = NO;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
- GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = NO;
- INFOPLIST_FILE = Resources/Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
- LIBRARY_SEARCH_PATHS = "";
- OTHER_CFLAGS = "-mcpu=G3";
- OTHER_CPLUSPLUSFLAGS = (
- "$(OTHER_CFLAGS)",
- "-mcpu=G3",
- );
- OTHER_LDFLAGS = "";
- PRODUCT_NAME = KisMAC;
- SECTORDER_FLAGS = "";
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- );
- WRAPPER_EXTENSION = app;
- };
dependencies = (
);
name = KisMAC;
@@ -1800,12 +1674,6 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 00A915960858D6410093943F /*
Build configuration list for PBXProject "KisMAC" */;
- buildSettings = {
- };
- buildStyles = (
- 4A9504CCFFE6A4B311CA0CBA /* Development */,
- 4A9504CDFFE6A4B311CA0CBA /* Deployment */,
- );
hasScannedForEncodings = 1;
knownRegions = (
English,
Modified: trunk/Sources/Controller/ScanControllerScriptable.m
===================================================================
--- trunk/Sources/Controller/ScanControllerScriptable.m 2006-05-25 03:28:40 UTC
(rev 150)
+++ trunk/Sources/Controller/ScanControllerScriptable.m 2006-05-25 14:42:44 UTC
(rev 151)
@@ -267,6 +267,8 @@
}
- (BOOL)exportKML:(NSString*)filename {
+ NSParameterAssert(filename);
+ filename = [filename standardPath];
[self showBusy:@selector(performExportKML:) withArg:filename];
if (_asyncFailure) [self showExportFailureDialog];
return !_asyncFailure;
Other related posts:
- » [kismac] [binaervarianz] r151 - in trunk: . KisMAC.xcodeproj Sources/Controller