Permalink
Browse files

rhosimulator/macosx: build & permissions fix

  • Loading branch information...
1 parent 92980b8 commit 87ef81459c096d97ed3ca52d289d49a873fcabbb @timashev timashev committed May 24, 2012
Showing with 16 additions and 14 deletions.
  1. +9 −0 .gitignore
  2. 0 lib/extensions/zlib/ext/build
  3. BIN ...form/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtCore.framework/Versions/4/QtCore
  4. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Versions/4/QtGui
  5. BIN ...sx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtNetwork.framework/Versions/4/QtNetwork
  6. BIN .../osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtWebKit.framework/Versions/4/QtWebKit
  7. +1 −1 platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist
  8. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/MacOS/RhoSimulator
  9. BIN ...rm/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/accessible/libqtaccessiblewidgets.dylib
  10. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/bearer/libqcorewlanbearer.dylib
  11. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/bearer/libqgenericbearer.dylib
  12. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqcncodecs.dylib
  13. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqjpcodecs.dylib
  14. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqkrcodecs.dylib
  15. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqtwcodecs.dylib
  16. BIN .../bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/graphicssystems/libqtracegraphicssystem.dylib
  17. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqgif.dylib
  18. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqico.dylib
  19. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqjpeg.dylib
  20. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqmng.dylib
  21. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtga.dylib
  22. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtiff.dylib
  23. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/qmltooling/libqmldbg_inspector.dylib
  24. BIN platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/qmltooling/libqmldbg_tcp.dylib
  25. +2 −11 platform/shared/common/BundleManager.cpp
  26. +4 −2 platform/shared/qt/rholib/rholib.pro
View
@@ -231,3 +231,12 @@ platform/wm/tools/Debug/*
platform/wm/tools/Release/*
platform/wm/tools/detool/Debug/*
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/*
View
0 lib/extensions/zlib/ext/build 100644 → 100755
No changes.
@@ -7,7 +7,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<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>
<string>????</string>
<key>CFBundleExecutable</key>
Binary file not shown.
@@ -37,7 +37,7 @@ using namespace rho::common;
extern "C" void rho_sys_app_exit();
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);
#endif
@@ -311,7 +311,7 @@ void CReplaceBundleThread::doReplaceBundle()
return;
}
-#ifdef OS_MACOSX
+#if defined(OS_MACOSX) && !defined(RHODES_EMULATOR)
// prepare main folder for update (replace sym-link by real folder/files)
if ( rho_prepare_folder_for_upgrade( RHODESAPP().getAppRootPath().c_str() ) == 0) {
// error
@@ -387,12 +387,3 @@ int rho_sysimpl_remove_bundle_files(const char* path, const char* fileListName)
}
} //extern "C"
-
-
-
-
-
-
-
-
-
@@ -96,7 +96,8 @@ HEADERS += ../../common/RhoAppAdapter.h\
../../common/RhoMath.h\
../../common/map/ESRIMapEngine.h\
../../common/map/GoogleMapEngine.h\
-../../common/map/MapEngine.h
+../../common/map/MapEngine.h\
+../../unzip/zip.h
SOURCES += ../../common/RhoTime.cpp\
../../rubyext/RhoAppAdapter.cpp\
@@ -131,4 +132,5 @@ SOURCES += ../../common/RhoTime.cpp\
../../common/map/ESRIMapEngine.cpp\
../../common/map/GoogleMapEngine.cpp\
../../common/map/MapEngine.cpp\
-../../common/BundleManager.cpp
+../../common/BundleManager.cpp\
+../../unzip/zip.cpp

0 comments on commit 87ef814

Please sign in to comment.