Skip to content

Commit

Permalink
rhosimulator/macosx: build & permissions fix
Browse files Browse the repository at this point in the history
  • Loading branch information
timashev committed May 24, 2012
1 parent 92980b8 commit 87ef814
Show file tree
Hide file tree
Showing 26 changed files with 16 additions and 14 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Expand Up @@ -231,3 +231,12 @@ platform/wm/tools/Debug/*
platform/wm/tools/Release/* platform/wm/tools/Release/*
platform/wm/tools/detool/Debug/* platform/wm/tools/detool/Debug/*
platform/wm/tools/detool/Release/* platform/wm/tools/detool/Release/*

platform/osx/bin/curl/*
platform/osx/bin/extensions/*
platform/osx/bin/rholib/*
platform/osx/bin/rubylib/*
platform/osx/bin/sqlite3/*
platform/osx/bin/syncengine/*
platform/osx/bin/RhoSimulator/generated_files/*
platform/osx/bin/RhoSimulator/tmp/*
Empty file modified lib/extensions/zlib/ext/build 100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Expand Up @@ -7,7 +7,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>RhoSimulator 3.3.3.beta.5.6, Copyright 2010-2012 Rhomobile, Inc.</string> <string>RhoSimulator 3.3.3, Copyright 2010-2012 Rhomobile, Inc.</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
Expand Down
Binary file modified platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/MacOS/RhoSimulator 100644 → 100755
Binary file not shown.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
13 changes: 2 additions & 11 deletions platform/shared/common/BundleManager.cpp
Expand Up @@ -37,7 +37,7 @@ using namespace rho::common;
extern "C" void rho_sys_app_exit(); extern "C" void rho_sys_app_exit();
extern "C" void rho_sys_impl_exit_with_errormessage(const char* szTitle, const char* szMsg); extern "C" void rho_sys_impl_exit_with_errormessage(const char* szTitle, const char* szMsg);


#ifdef OS_MACOSX #if defined(OS_MACOSX) && !defined(RHODES_EMULATOR)
extern "C" int rho_prepare_folder_for_upgrade(const char* szPath); extern "C" int rho_prepare_folder_for_upgrade(const char* szPath);
#endif #endif


Expand Down Expand Up @@ -311,7 +311,7 @@ void CReplaceBundleThread::doReplaceBundle()
return; return;
} }


#ifdef OS_MACOSX #if defined(OS_MACOSX) && !defined(RHODES_EMULATOR)
// prepare main folder for update (replace sym-link by real folder/files) // prepare main folder for update (replace sym-link by real folder/files)
if ( rho_prepare_folder_for_upgrade( RHODESAPP().getAppRootPath().c_str() ) == 0) { if ( rho_prepare_folder_for_upgrade( RHODESAPP().getAppRootPath().c_str() ) == 0) {
// error // error
Expand Down Expand Up @@ -387,12 +387,3 @@ int rho_sysimpl_remove_bundle_files(const char* path, const char* fileListName)
} }


} //extern "C" } //extern "C"









6 changes: 4 additions & 2 deletions platform/shared/qt/rholib/rholib.pro
Expand Up @@ -96,7 +96,8 @@ HEADERS += ../../common/RhoAppAdapter.h\
../../common/RhoMath.h\ ../../common/RhoMath.h\
../../common/map/ESRIMapEngine.h\ ../../common/map/ESRIMapEngine.h\
../../common/map/GoogleMapEngine.h\ ../../common/map/GoogleMapEngine.h\
../../common/map/MapEngine.h ../../common/map/MapEngine.h\
../../unzip/zip.h


SOURCES += ../../common/RhoTime.cpp\ SOURCES += ../../common/RhoTime.cpp\
../../rubyext/RhoAppAdapter.cpp\ ../../rubyext/RhoAppAdapter.cpp\
Expand Down Expand Up @@ -131,4 +132,5 @@ SOURCES += ../../common/RhoTime.cpp\
../../common/map/ESRIMapEngine.cpp\ ../../common/map/ESRIMapEngine.cpp\
../../common/map/GoogleMapEngine.cpp\ ../../common/map/GoogleMapEngine.cpp\
../../common/map/MapEngine.cpp\ ../../common/map/MapEngine.cpp\
../../common/BundleManager.cpp ../../common/BundleManager.cpp\
../../unzip/zip.cpp

0 comments on commit 87ef814

Please sign in to comment.