1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-02-28 03:45:59 +01:00

OwnCloudFinder: Rename to SyncStateFinder

Project file names stay the same, only the output file(s) changed
This commit is contained in:
Markus Goetz 2014-10-23 12:19:19 +02:00
parent e726e7aad8
commit 0d9ae241c9
8 changed files with 52 additions and 48 deletions
admin/osx
shell_integration/MacOSX
CMakeLists.txt
OwnCloudFinder/OwnCloudFinder.xcodeproj
OwnCloudInjector
OwnCloudInjector.m
OwnCloudInjector.xcodeproj
deploy.sh
src/mirall

View File

@ -793,7 +793,7 @@
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Library/ScriptingAdditions/OwnCloudFinder.osax/Contents</string>
<string>Library/ScriptingAdditions/SyncStateFinder.osax/Contents</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
@ -807,7 +807,7 @@
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>OwnCloudFinder.osax</string>
<string>SyncStateFinder.osax</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>

View File

@ -2,10 +2,10 @@
if(APPLE)
add_custom_target( mac_overlayplugin ALL
xcodebuild -workspace ${CMAKE_SOURCE_DIR}/shell_integration/MacOSX/OwnCloud.xcworkspace
-scheme OwnCloudFinder.osax SYMROOT=${CMAKE_CURRENT_BINARY_DIR} archive
-scheme SyncStateFinder.osax SYMROOT=${CMAKE_CURRENT_BINARY_DIR} archive
COMMENT building Mac Overlay icons)
INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/OwnCloudFinder.osax/Contents
DESTINATION ${CMAKE_INSTALL_PREFIX}/Library/ScriptingAdditions/OwnCloudFinder.osax/ )
INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/SyncStateFinder.osax/Contents
DESTINATION ${CMAKE_INSTALL_PREFIX}/Library/ScriptingAdditions/SyncStateFinder.osax/ )
endif(APPLE)

View File

@ -48,7 +48,7 @@
8C37DDB9161594B400016A95 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
8C99F6921622D145002D2135 /* IconCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconCache.h; sourceTree = "<group>"; };
8C99F6931622D145002D2135 /* IconCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IconCache.m; sourceTree = "<group>"; };
8D576316048677EA00EA77CD /* OwnCloudFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OwnCloudFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
8D576316048677EA00EA77CD /* SyncStateFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SyncStateFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -67,7 +67,7 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
089C166AFE841209C02AAC07 /* OwnCloudFinder */ = {
089C166AFE841209C02AAC07 /* SyncStateFinder */ = {
isa = PBXGroup;
children = (
08FB77AFFE84173DC02AAC07 /* Source */,
@ -75,7 +75,7 @@
089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
19C28FB6FE9D52B211CA2CBB /* Products */,
);
name = OwnCloudFinder;
name = SyncStateFinder;
sourceTree = "<group>";
usesTabs = 1;
};
@ -144,7 +144,7 @@
19C28FB6FE9D52B211CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
8D576316048677EA00EA77CD /* OwnCloudFinder.bundle */,
8D576316048677EA00EA77CD /* SyncStateFinder.bundle */,
);
name = Products;
sourceTree = "<group>";
@ -152,9 +152,9 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
8D57630D048677EA00EA77CD /* OwnCloudFinder */ = {
8D57630D048677EA00EA77CD /* SyncStateFinder */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder" */;
buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SyncStateFinder" */;
buildPhases = (
8D57630F048677EA00EA77CD /* Resources */,
8D576311048677EA00EA77CD /* Sources */,
@ -164,10 +164,10 @@
);
dependencies = (
);
name = OwnCloudFinder;
name = SyncStateFinder;
productInstallPath = "$(HOME)/Library/Bundles";
productName = OwnCloudFinder;
productReference = 8D576316048677EA00EA77CD /* OwnCloudFinder.bundle */;
productName = SyncStateFinder;
productReference = 8D576316048677EA00EA77CD /* SyncStateFinder.bundle */;
productType = "com.apple.product-type.bundle";
};
/* End PBXNativeTarget section */
@ -178,7 +178,7 @@
attributes = {
LastUpgradeCheck = 0460;
};
buildConfigurationList = 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "OwnCloudFinder" */;
buildConfigurationList = 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "SyncStateFinder" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
@ -188,11 +188,11 @@
French,
German,
);
mainGroup = 089C166AFE841209C02AAC07 /* OwnCloudFinder */;
mainGroup = 089C166AFE841209C02AAC07 /* SyncStateFinder` */;
projectDirPath = "";
projectRoot = "";
targets = (
8D57630D048677EA00EA77CD /* OwnCloudFinder */,
8D57630D048677EA00EA77CD /* SyncStateFinder */,
);
};
/* End PBXProject section */
@ -252,7 +252,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = OwnCloudFinder;
PRODUCT_NAME = SyncStateFinder;
WRAPPER_EXTENSION = bundle;
};
name = Debug;
@ -269,7 +269,7 @@
GCC_MODEL_TUNING = G5;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = OwnCloudFinder;
PRODUCT_NAME = SyncStateFinder;
WRAPPER_EXTENSION = bundle;
};
name = Release;
@ -308,7 +308,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder" */ = {
1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SyncStateFinder" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB911B08733D790010E9CD /* Debug */,
@ -317,7 +317,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "OwnCloudFinder" */ = {
1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "SyncStateFinder" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB911F08733D790010E9CD /* Debug */,

View File

@ -27,7 +27,7 @@ static NSString* globalLock = @"I'm the global lock to prevent concruent handler
@end
static bool liferayNativityLoaded = false;
static NSString* liferayNativityBundleName = @"OwnCloudFinder";
static NSString* liferayNativityBundleName = @"SyncStateFinder";
typedef struct {
NSString* location;
@ -85,7 +85,7 @@ static OSErr loadBundle(LNBundleType type, AppleEvent* reply, long refcon) {
}
if (isLoaded) {
NSLog(@"LiferayNativityInjector: %@ already loaded.", bundleName);
NSLog(@"OwnCloudInjector: %@ already loaded.", bundleName);
return noErr;
}

View File

@ -7,7 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
0B36CB92182461A10039B237 /* OwnCloudFinder.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B36CB91182461A10039B237 /* OwnCloudFinder.bundle */; };
0B36CB92182461A10039B237 /* SyncStateFinder.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B36CB91182461A10039B237 /* SyncStateFinder.bundle */; };
0BD9C38E1778EF450094CF5D /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0BD9C38D1778EF450094CF5D /* license.txt */; };
8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
@ -19,10 +19,10 @@
/* Begin PBXFileReference section */
089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
0B36CB91182461A10039B237 /* OwnCloudFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = OwnCloudFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
0B36CB91182461A10039B237 /* SyncStateFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = SyncStateFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
0BD9C38D1778EF450094CF5D /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = "<group>"; };
8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D60A992314CE37030061AD6D /* OwnCloudFinder.osax */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OwnCloudFinder.osax; sourceTree = BUILT_PRODUCTS_DIR; };
D60A992314CE37030061AD6D /* SyncStateFinder.osax */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SyncStateFinder.osax; sourceTree = BUILT_PRODUCTS_DIR; };
D6ACBE9E117B7D5600F6691C /* OwnCloudInjector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OwnCloudInjector.m; sourceTree = "<group>"; };
D6ACBE9F117B7D5600F6691C /* LNVersionComparisonProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNVersionComparisonProtocol.h; sourceTree = "<group>"; };
D6ACBEA0117B7D5600F6691C /* LNStandardVersionComparator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNStandardVersionComparator.m; sourceTree = "<group>"; };
@ -51,7 +51,7 @@
D60A992414CE37030061AD6D /* Products */,
);
indentWidth = 2;
name = "TotalFinder-osax";
name = "SyncStateFinder-osax";
sourceTree = "<group>";
tabWidth = 2;
usesTabs = 0;
@ -67,7 +67,7 @@
089C167CFE841241C02AAC07 /* Resources */ = {
isa = PBXGroup;
children = (
0B36CB91182461A10039B237 /* OwnCloudFinder.bundle */,
0B36CB91182461A10039B237 /* SyncStateFinder.bundle */,
D6ACBEA4117B7D6100F6691C /* OwnCloudInjector.sdef */,
8D576317048677EA00EA77CD /* Info.plist */,
8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
@ -90,7 +90,7 @@
D60A992414CE37030061AD6D /* Products */ = {
isa = PBXGroup;
children = (
D60A992314CE37030061AD6D /* OwnCloudFinder.osax */,
D60A992314CE37030061AD6D /* SyncStateFinder.osax */,
);
name = Products;
sourceTree = "<group>";
@ -98,9 +98,9 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
8D57630D048677EA00EA77CD /* OwnCloudFinder.osax */ = {
8D57630D048677EA00EA77CD /* SyncStateFinder.osax */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder.osax" */;
buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SyncStateFinder.osax" */;
buildPhases = (
8D57630F048677EA00EA77CD /* Resources */,
8D576311048677EA00EA77CD /* Sources */,
@ -110,10 +110,10 @@
);
dependencies = (
);
name = OwnCloudFinder.osax;
name = SyncStateFinder.osax;
productInstallPath = "$(HOME)/Library/Bundles";
productName = "TotalFinder-osax";
productReference = D60A992314CE37030061AD6D /* OwnCloudFinder.osax */;
productName = "SyncStateFinder-osax";
productReference = D60A992314CE37030061AD6D /* SyncStateFinder.osax */;
productType = "com.apple.product-type.bundle";
};
/* End PBXNativeTarget section */
@ -139,7 +139,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
8D57630D048677EA00EA77CD /* OwnCloudFinder.osax */,
8D57630D048677EA00EA77CD /* SyncStateFinder.osax */,
);
};
/* End PBXProject section */
@ -149,7 +149,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0B36CB92182461A10039B237 /* OwnCloudFinder.bundle in Resources */,
0B36CB92182461A10039B237 /* SyncStateFinder.bundle in Resources */,
8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
D6ACBEA5117B7D6100F6691C /* OwnCloudInjector.sdef in Resources */,
0BD9C38E1778EF450094CF5D /* license.txt in Resources */,
@ -195,7 +195,7 @@
"-framework",
AppKit,
);
PRODUCT_NAME = OwnCloudFinder;
PRODUCT_NAME = SyncStateFinder;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = osax;
};
@ -214,7 +214,7 @@
"-framework",
AppKit,
);
PRODUCT_NAME = OwnCloudFinder;
PRODUCT_NAME = SyncStateFinder;
WRAPPER_EXTENSION = osax;
};
name = Release;
@ -245,7 +245,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder.osax" */ = {
1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SyncStateFinder.osax" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB911B08733D790010E9CD /* Debug */,

View File

@ -15,8 +15,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8D57630D048677EA00EA77CD"
BuildableName = "OwnCloudFinder.bundle"
BlueprintName = "OwnCloudFinder"
BuildableName = "SyncStateFinder.bundle"
BlueprintName = "SyncStateFinder"
ReferencedContainer = "container:../OwnCloudFinder/OwnCloudFinder.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@ -29,8 +29,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8D57630D048677EA00EA77CD"
BuildableName = "OwnCloudFinder.osax"
BlueprintName = "OwnCloudFinder.osax"
BuildableName = "SyncStateFinder.osax"
BlueprintName = "SyncStateFinder.osax"
ReferencedContainer = "container:OwnCloudInjector.xcodeproj">
</BuildableReference>
</BuildActionEntry>

View File

@ -1,10 +1,10 @@
#!/bin/sh
# osascript $HOME/owncloud.com/mirall/shell_integration/MacOSX/unload.scpt
sudo rm -rf /Library/ScriptingAdditions/OwnCloudFinder.osax
sudo rm -rf /Library/ScriptingAdditions/SyncStateFinder.osax
# Klaas' machine
OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Products/Debug/OwnCloudFinder.osax
[ -d $OSAXDIR ] ||OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Intermediates/ArchiveIntermediates/OwnCloudFinder.osax/IntermediateBuildFilesPath/UninstalledProducts/OwnCloudFinder.osax
OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Products/Debug/SyncStateFinder.osax
[ -d $OSAXDIR ] ||OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Intermediates/ArchiveIntermediates/SyncStateFinder.osax/IntermediateBuildFilesPath/UninstalledProducts/SyncStateFinder.osax
# Markus' machine
[ -d $OSAXDIR ] || echo "OSAX does not exist"

View File

@ -101,8 +101,9 @@ ownCloudGui::ownCloudGui(Application *parent) :
void ownCloudGui::setupOverlayIcons()
{
if( Utility::isMac() && QFile::exists("/Library/ScriptingAdditions/OwnCloudFinder.osax") ) {
#ifdef Q_OS_MAC
const QLatin1String finderExtension("/Library/ScriptingAdditions/SyncStateFinder.osax");
if(QFile::exists(finderExtension) ) {
QString aScript = QString::fromUtf8("tell application \"Finder\"\n"
" try\n"
" «event OWNCload»\n"
@ -122,7 +123,10 @@ void ownCloudGui::setupOverlayIcons()
QString resultAsString(result); // if appropriate
qDebug() << "Laod Finder Overlay-Plugin: " << resultAsString << ": " << p.exitCode()
<< (p.exitCode() != 0 ? p.errorString() : QString::null);
} else {
qDebug() << finderExtension << "does not exist! Finder Overlay Plugin loading failed";
}
#endif
}
// This should rather be in application.... or rather in MirallConfigFile?