rhodes/rhodes-generator/generators/templates/application/rhoconfig.txt @@ -39,7 +39,7 @@ The Rhodes directory structure is outlined below. In a default Rhodes applicati /appname build.yml (contains the settings for running builds) - config.rb (contains settings for setting the default start and options path) + rhoconfig.txt (contains settings for setting the default start and options path) Rakefile /public (contains static resources for the generated objects) /css README.textile @@ -9,7 +9,7 @@ public class RhoConf { private java.util.Hashtable m_mapValues = new java.util.Hashtable(); private static RhoConf m_Instance; - private static String CONF_FILENAME = "rhoconfig.txt"; + private static String CONF_FILENAME = "apps/rhoconfig.txt"; public static RhoConf getInstance(){return m_Instance;} platform/bb/RubyVM/src/com/rho/RhoConf.java @@ -118,10 +118,6 @@ static bool UnzipApplication(const char* appRoot, const void* zipbuf, unsigned i [self copyFromMainBundle:@"db" replace:replaceFiles]; //TBD: need to check db version reset db if different #endif -#if TARGET_IPHONE_SIMULATOR //DEBUG - [self copyFromMainBundle:@"rhoconfig.txt" replace:replaceFiles]; -#endif - } @end platform/iphone/Classes/AppManager/AppManager.m @@ -39,7 +39,6 @@ <mkdir dir="${target.dir}" /> <ant dir = "${sharedAnt.dir}"/> - <copy file="rhoconfig.txt" todir="${src.dir}"/> </target> <target name="rhobundle" depends="RhoBundle"></target> platform/iphone/rbuild/build.xml @@ -26,7 +26,6 @@ 467E716E0EB673F000E5958D /* lib in Resources */ = {isa = PBXBuildFile; fileRef = 467E713F0EB673F000E5958D /* lib */; }; 467E71720EB6740400E5958D /* db in Resources */ = {isa = PBXBuildFile; fileRef = 467E716F0EB6740400E5958D /* db */; }; 46C744690EAFA99D00CC76F1 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 46C744680EAFA99D00CC76F1 /* icon.png */; }; - 5C6B44730F946504003CB43A /* rhoconfig.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5C6B44720F946504003CB43A /* rhoconfig.txt */; }; F52181130F96B13500B7F974 /* LogViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F52181120F96B13500B7F974 /* LogViewController.m */; }; F52181160F96B14B00B7F974 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F52181140F96B14B00B7F974 /* log.cpp */; }; F5342AD10F65BF7D003FD158 /* HttpCallback.m in Sources */ = {isa = PBXBuildFile; fileRef = F5342AD00F65BF7D003FD158 /* HttpCallback.m */; }; @@ -148,7 +147,6 @@ 467E716F0EB6740400E5958D /* db */ = {isa = PBXFileReference; lastKnownFileType = folder; name = db; path = bin/RhoBundle/db; sourceTree = "<group>"; }; 46C744680EAFA99D00CC76F1 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = SOURCE_ROOT; }; 5C1256870F7CEA9200C87274 /* tcmalloc.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = tcmalloc.xcodeproj; path = tcmalloc/tcmalloc.xcodeproj; sourceTree = "<group>"; }; - 5C6B44720F946504003CB43A /* rhoconfig.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rhoconfig.txt; path = rbuild/rhoconfig.txt; sourceTree = "<group>"; }; 5C7162920F8B7EEC0096B6AA /* RhoLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RhoLib.xcodeproj; path = RhoLib/RhoLib.xcodeproj; sourceTree = "<group>"; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; F52181110F96B13500B7F974 /* LogViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogViewController.h; sourceTree = "<group>"; }; @@ -260,7 +258,6 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( - 5C6B44720F946504003CB43A /* rhoconfig.txt */, 466B0FC90F3CFA8000A52314 /* Icons */, 5C7162920F8B7EEC0096B6AA /* RhoLib.xcodeproj */, F563D53B0EA8240D0062DA57 /* rhosynclib.xcodeproj */, @@ -552,7 +549,6 @@ 4640FE950F410A3400B7975E /* back_btn.png in Resources */, 4640FE960F410A3400B7975E /* forward_btn.png in Resources */, 461B5A880F82D89700B08CB9 /* gears.png in Resources */, - 5C6B44730F946504003CB43A /* rhoconfig.txt in Resources */, F547F1DB0F990084007C2CD2 /* Settings.bundle in Resources */, ); runOnlyForDeploymentPostprocessing = 0; platform/iphone/rhorunner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ #include "RhoFilePath.h" #include "StringConverter.h" -static const char* CONF_FILENAME = "rhoconfig.txt"; +static const char* CONF_FILENAME = "apps/rhoconfig.txt"; namespace rho{ namespace general{ @@ -78,8 +78,8 @@ void RhoSettings::loadProperty( const char* start, int len ){ const char* szValue = start + i+1; int nValueLen = len - (i+1); - while(*szValue==' '&& nValueLen >= 0 ){ szValue++; nValueLen--;} - while(nValueLen > 0 && szValue[nValueLen-1]==' ') nValueLen--; + while(*szValue==' ' || *szValue=='\'' || *szValue=='"' && nValueLen >= 0 ){ szValue++; nValueLen--;} + while(nValueLen > 0 && szValue[nValueLen-1]==' ' || szValue[nValueLen-1]=='\'' || szValue[nValueLen-1]=='"') nValueLen--; setPropertyByName(start, nNameLen, szValue, nValueLen ); } platform/shared/common/RhoConf.cpp @@ -58,7 +58,7 @@ namespace "bundle" do #throw "ME" cp_r 'app',File.join($srcdir,'apps') cp_r 'public', File.join($srcdir,'apps') - cp 'config.rb', File.join($srcdir,'apps') + cp 'rhoconfig.txt', File.join($srcdir,'apps') #cp 'index.erb', File.join($srcdir,'apps') #cp 'layout.erb', File.join($srcdir,'apps') #cp 'loading.html', File.join($srcdir,'apps') rhodes/rhodes-build/lib/tasks/android.rake @@ -42,7 +42,7 @@ namespace "bundle" do #throw "ME" cp_r 'app',File.join($srcdir,'apps') cp_r 'public', File.join($srcdir,'apps') - cp 'config.rb', File.join($srcdir,'apps') + cp 'rhoconfig.txt', File.join($srcdir,'apps') #cp 'index.erb', File.join($srcdir,'apps') #cp 'layout.erb', File.join($srcdir,'apps') #cp 'loading.html', File.join($srcdir,'apps') rhodes/rhodes-build/lib/tasks/blackberry.rake @@ -47,7 +47,7 @@ namespace "bundle" do chdir $basedir cp_r 'app',File.join($srcdir,'apps') cp_r 'public', File.join($srcdir,'apps') - cp 'config.rb', File.join($srcdir,'apps') + cp 'rhoconfig.txt', File.join($srcdir,'apps') cp $appmanifest, $srcdir puts `#{rubypath} -R#{$rhodeslib} #{$srcdir}/createAppManifest.rb` rhodes/rhodes-build/lib/tasks/iphone.rake @@ -41,7 +41,7 @@ namespace "bundle" do chdir $basedir cp_r 'app',File.join($srcdir,'apps') cp_r 'public', File.join($srcdir,'apps') - cp 'config.rb', File.join($srcdir,'apps') + cp 'rhoconfig.txt', File.join($srcdir,'apps') cp $appmanifest, $srcdir puts `#{rubypath} -I#{$rhodeslib} #{$srcdir}/createAppManifest.rb` rhodes/rhodes-build/lib/tasks/linux.rake @@ -42,7 +42,7 @@ namespace "bundle" do chdir $basedir cp_r 'app',File.join($srcdir,'apps') cp_r 'public', File.join($srcdir,'apps') - cp 'config.rb', File.join($srcdir,'apps') + cp 'rhoconfig.txt', File.join($srcdir,'apps') cp $appmanifest, $srcdir puts `#{rubypath} -R#{$rhodeslib} #{$srcdir}/createAppManifest.rb` rhodes/rhodes-build/lib/tasks/symbian.rake @@ -43,7 +43,7 @@ namespace "bundle" do chdir $basedir cp_r 'app',File.join($srcdir,'apps') cp_r 'public', File.join($srcdir,'apps') - cp 'config.rb', File.join($srcdir,'apps') + cp 'rhoconfig.txt', File.join($srcdir,'apps') cp $appmanifest, $srcdir puts `#{rubypath} -R#{$rhodeslib} #{$srcdir}/createAppManifest.rb` rhodes/rhodes-build/lib/tasks/wm.rake @@ -44,7 +44,7 @@ Spec::Rake::SpecTask.new do |t| t.rcov_opts = ['--include', '"lib/rhom/*,lib/rho/*"', '-x', - 'spec,gems,sqlite3/*,lib/date.rb,lib/rational.rb,lib/time.rb,lib/find.rb,config.rb,lib/erb.rb,lib/singleton.rb,lib/pairparser.rb', + 'spec,gems,sqlite3/*,lib/date.rb,lib/rational.rb,lib/time.rb,lib/find.rb,lib/erb.rb,lib/singleton.rb,lib/pairparser.rb', '--text-report', '--html'] end rhodes/rhodes-framework/Rakefile @@ -10,6 +10,7 @@ module Rho def initialize(app_manifest_filename=nil) puts "Calling RHO.initialize" + load Rho::RhoFSConnector.get_rhoconfig_filename Rhom::RhomDbAdapter::open(Rho::RhoFSConnector::get_db_fullpathname) if app_manifest_filename process_model_dirs(app_manifest_filename) rhodes/rhodes-framework/lib/rho/rho.rb @@ -15,6 +15,10 @@ module Rho def get_app_manifest_filename File.join(__rhoGetCurrentDir(), 'apps/app_manifest.txt') end + + def get_rhoconfig_filename + File.join(__rhoGetCurrentDir(), 'apps/rhoconfig.txt') + end def get_model_path(appname, modelname) File.join(__rhoGetCurrentDir(), 'apps/'+appname+'/'+modelname+'/') rhodes/rhodes-framework/lib/rho/rhofsconnector.rb @@ -28,10 +28,9 @@ module Rhom def open(dbfile=nil) puts "DB name = " + dbfile.inspect unless @@database or dbfile.nil? - db = DbAdapter.new(Rhodes::DBVERSION) - @@database = db + db = DbAdapter.new(Rhodes::DBVERSION) + @@database = db end - end def close rhodes/rhodes-framework/lib/rhom/rhom_db_adapterME.rb @@ -13,7 +13,6 @@ generators/templates/application/app/index.erb generators/templates/application/app/layout.erb generators/templates/application/app/loading.html generators/templates/application/build.yml -generators/templates/application/config.rb generators/templates/application/public/css/base.css generators/templates/application/public/css/blackberry.css generators/templates/application/public/css/iphone.css @@ -44,6 +43,7 @@ generators/templates/application/public/js/jquery-1.2.6.min.js generators/templates/application/public/js/rho.js generators/templates/application/public/js/rhogeolocation-wm.js generators/templates/application/public/js/rhogeolocation.js +generators/templates/application/rhoconfig.txt generators/templates/bundle/db/syncdb.sqlite generators/templates/model/config.rb generators/templates/model/controller.rb rhodes/rhodes-generator/Manifest.txt @@ -33,8 +33,8 @@ module Rhogen second_argument :zip_url, :required => false, :desc => "optional url to zipfile download of bundle" template :config do |template| - template.source = 'config.rb' - template.destination = "#{name}/config.rb" + template.source = 'rhoconfig.txt' + template.destination = "#{name}/rhoconfig.txt" end template :buildyml do |template| rhodes/rhodes-generator/generators/rhogen.rb @@ -25,6 +25,12 @@ describe Rhogen::AppGenerator do @generator.should create("/tmp/#{app_name}/app/#{template}") end end + + it "should create rhoconfig.txt, build.yml, Rakefile" do + ['Rakefile', 'rhoconfig.txt', 'build.yml'].each do |template| + @generator.should create("/tmp/#{app_name}/#{template}") + end + end it "should generate valid erb templates" do pending "need to figure out how to validate erb" rhodes/rhodes-generator/spec/app_generator_spec.rb platform/iphone/rbuild/rhoconfig.txt rhodes/rhodes-generator/generators/templates/application/config.rb c082e691d58358107f9494477b5b4e44e7b06a61 lars larsburgess@gmail.com http://github.com/rhomobile/rhodes/commit/afdb1065c6cff7e755ff80751da00e2d2fe00938 afdb1065c6cff7e755ff80751da00e2d2fe00938 2009-05-05T12:13:53-07:00 2009-05-05T12:13:53-07:00 use rhoconfig.txt from app folder, updated build scripts to copy it properly [#549] 7dcd47f81681bd53fe4e9a66e80e1fc0a1f55775 lars larsburgess@gmail.com