Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

wp8: fix issue with rake command inside project

  • Loading branch information...
commit dbb79705c9297cbcec52209a365cc5e288a506ca 1 parent b3503ac
@genywind genywind authored
View
3  Rakefile
@@ -282,6 +282,8 @@ namespace "config" do
end
end
+ $app_path = ENV["RHO_APP_PATH"] if ENV["RHO_APP_PATH"] && $app_path.nil?
+
if $app_path.nil? #if we are called from the rakefile directly, this wont be set
#load the apps path and config
@@ -292,6 +294,7 @@ namespace "config" do
end
end
+ ENV["RHO_APP_PATH"] = $app_path.to_s
ENV["ROOT_PATH"] = $app_path.to_s + '/app/'
ENV["APP_TYPE"] = "rhodes"
View
14 platform/wp8/build/wp.rake
@@ -29,9 +29,9 @@ namespace "config" do
$current_platform = "wp8" unless $current_platform
end
- task :set_wp8_app_path do
- ENV['RHO_APP_PATH'] = $app_path
- end
+ #task :set_wp8_app_path do
+# ENV['RHO_APP_PATH'] = $app_path
+ # end
task :wp8_ARM_Release do
$sdk = 'ARM'
@@ -55,9 +55,9 @@ namespace "config" do
task :wp8 => [:set_wp8_platform, "config:common"] do
- if ENV['RHO_APP_PATH'] != nil
- $app_path = ENV['RHO_APP_PATH']
- end
+ #if ENV['RHO_APP_PATH'] != nil
+ # $app_path = ENV['RHO_APP_PATH']
+ #end
$rubypath = "res/build-tools/RhoRuby.exe"
$zippath = "res/build-tools/7za.exe"
@@ -354,7 +354,7 @@ namespace "run" do
end
desc "Build, install .xap and run on WP8 emulator"
- task :wp8 => ["config:set_wp8_app_path", "emulator:wp8:production"] do
+ task :wp8 => ["emulator:wp8:production"] do
if $app_config["wp"] && $app_config["wp"]["productid"] != nil
View
12 platform/wp8/curl/libcurl.vcxproj
@@ -153,7 +153,7 @@
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Release/libcurl.bsc</OutputFile>
+ <OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -188,7 +188,7 @@
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Release/libcurl.bsc</OutputFile>
+ <OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -223,7 +223,7 @@
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Release/libcurl.bsc</OutputFile>
+ <OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -257,7 +257,7 @@
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Debug/libcurl.bsc</OutputFile>
+ <OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -291,7 +291,7 @@
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Debug/libcurl.bsc</OutputFile>
+ <OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -324,7 +324,7 @@
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Debug/libcurl.bsc</OutputFile>
+ <OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>

0 comments on commit dbb7970

Please sign in to comment.
Something went wrong with that request. Please try again.