Skip to content

Commit 5f15693

Browse files
jimevansjimevans
committed
Updating build process to build native events components for FF23
1 parent 4b1edab commit 5f15693

File tree

4 files changed

+35
-23
lines changed

4 files changed

+35
-23
lines changed

‎Rakefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,18 @@ GeckoSDKs.new do |sdks|
468468
sdks.add 'third_party/gecko-22/win32',
469469
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/22.0/sdk/xulrunner-22.0.en-US.win32.sdk.zip',
470470
'2f9cd784be008aa2b18231a365d6b59a'
471+
472+
sdks.add 'third_party/gecko-23/linux',
473+
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/23.0/sdk/xulrunner-23.0.en-US.linux-i686.sdk.tar.bz2',
474+
'19cf2596c01fe981f72a5726104e4f06'
475+
476+
sdks.add 'third_party/gecko-23/linux64',
477+
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/23.0/sdk/xulrunner-23.0.en-US.linux-x86_64.sdk.tar.bz2',
478+
'17dec0f03d6c3c793a6d532dabfd0124'
479+
480+
sdks.add 'third_party/gecko-23/win32',
481+
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/23.0/sdk/xulrunner-23.0.en-US.win32.sdk.zip',
482+
'f5e5945ee9a541fca65f3f9355160104'
471483
end
472484

473485
task :'selenium-server_zip' do

‎cpp/build.desc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ visualc_library(name = "firefoxlatest_esr_dll",
2222
visualc_library(name = "firefoxprevious_dll",
2323
platform = "Win32",
2424
project = "webdriver-firefox/webdriver-firefox-previous.vcxproj",
25-
file_deps = "third_party/gecko-21/win32",
25+
file_deps = "third_party/gecko-22/win32",
2626
out = "Win32/Release/webdriver-firefox-previous.dll"
2727
)
2828

2929
visualc_library(name = "firefoxlatest_dll",
3030
platform = "Win32",
3131
project = "webdriver-firefox/webdriver-firefox-latest.vcxproj",
32-
file_deps = "third_party/gecko-22/win32",
32+
file_deps = "third_party/gecko-23/win32",
3333
out = "Win32/Release/webdriver-firefox-latest.dll"
3434
)
3535

@@ -94,28 +94,28 @@ mozilla_lib(name = "webdriver_firefox_previous",
9494
"webdriver-interactions/interactions_common.*",
9595
"webdriver-firefox/*.cpp"],
9696
arch = "i386",
97-
geckoversion="21")
97+
geckoversion="22")
9898

9999
mozilla_lib(name = "webdriver_firefox_previous_64",
100100
srcs = [ "webdriver-interactions/*_linux*.cpp",
101101
"webdriver-interactions/interactions_common.*",
102102
"webdriver-firefox/*.cpp"],
103103
arch = "amd64",
104-
geckoversion="21")
104+
geckoversion="22")
105105

106106
mozilla_lib(name = "webdriver_firefox_latest",
107107
srcs = [ "webdriver-interactions/*_linux*.cpp",
108108
"webdriver-interactions/interactions_common.*",
109109
"webdriver-firefox/*.cpp"],
110110
arch = "i386",
111-
geckoversion="22")
111+
geckoversion="23")
112112

113113
mozilla_lib(name = "webdriver_firefox_latest_64",
114114
srcs = [ "webdriver-interactions/*_linux*.cpp",
115115
"webdriver-interactions/interactions_common.*",
116116
"webdriver-firefox/*.cpp"],
117117
arch = "amd64",
118-
geckoversion="22")
118+
geckoversion="23")
119119

120120
gcc_library(name = "noblur",
121121
srcs = [ "linux-specific/*.c" ],

‎cpp/webdriver-firefox/webdriver-firefox-latest.vcxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9292
<ClCompile>
9393
<Optimization>Disabled</Optimization>
94-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\include;$(ProjectDir)..\..\third_party\gecko-22\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
94+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-23\win32\include;$(ProjectDir)..\..\third_party\gecko-23\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
9595
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9696
<MinimalRebuild>true</MinimalRebuild>
9797
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -101,7 +101,7 @@
101101
</ClCompile>
102102
<Link>
103103
<AdditionalDependencies>nspr4.lib;xpcom.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
104-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
104+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-23\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
105105
<GenerateDebugInformation>true</GenerateDebugInformation>
106106
<TargetMachine>MachineX86</TargetMachine>
107107
</Link>
@@ -112,7 +112,7 @@
112112
</Midl>
113113
<ClCompile>
114114
<Optimization>Disabled</Optimization>
115-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\include;$(ProjectDir)..\..\third_party\gecko-22\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
115+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-23\win32\include;$(ProjectDir)..\..\third_party\gecko-23\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
116116
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117117
<MinimalRebuild>true</MinimalRebuild>
118118
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -122,7 +122,7 @@
122122
</ClCompile>
123123
<Link>
124124
<AdditionalDependencies>nspr4.lib;xpcom.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
125-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
125+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-23\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
126126
<GenerateDebugInformation>true</GenerateDebugInformation>
127127
<TargetMachine>MachineX64</TargetMachine>
128128
</Link>
@@ -131,7 +131,7 @@
131131
<ClCompile>
132132
<Optimization>MaxSpeed</Optimization>
133133
<IntrinsicFunctions>true</IntrinsicFunctions>
134-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\include;$(ProjectDir)..\..\third_party\gecko-22\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
134+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-23\win32\include;$(ProjectDir)..\..\third_party\gecko-23\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
135135
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136136
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
137137
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -141,7 +141,7 @@
141141
</ClCompile>
142142
<Link>
143143
<AdditionalDependencies>xul.lib;nss3.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
144-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
144+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-23\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
145145
<GenerateDebugInformation>false</GenerateDebugInformation>
146146
<OptimizeReferences>true</OptimizeReferences>
147147
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -155,7 +155,7 @@
155155
<ClCompile>
156156
<Optimization>MaxSpeed</Optimization>
157157
<IntrinsicFunctions>true</IntrinsicFunctions>
158-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\include;$(ProjectDir)..\..\third_party\gecko-22\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
158+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-23\win32\include;$(ProjectDir)..\..\third_party\gecko-23\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
159159
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160160
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
161161
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -164,7 +164,7 @@
164164
</ClCompile>
165165
<Link>
166166
<AdditionalDependencies>nspr4.lib;xpcom.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
167-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
167+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-23\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
168168
<GenerateDebugInformation>true</GenerateDebugInformation>
169169
<OptimizeReferences>true</OptimizeReferences>
170170
<EnableCOMDATFolding>true</EnableCOMDATFolding>

‎cpp/webdriver-firefox/webdriver-firefox-previous.vcxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9292
<ClCompile>
9393
<Optimization>Disabled</Optimization>
94-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-21\win32\include;$(ProjectDir)..\..\third_party\gecko-21\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
94+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\include;$(ProjectDir)..\..\third_party\gecko-22\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
9595
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9696
<MinimalRebuild>true</MinimalRebuild>
9797
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -101,7 +101,7 @@
101101
</ClCompile>
102102
<Link>
103103
<AdditionalDependencies>nspr4.lib;xpcom.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
104-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-21\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
104+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
105105
<GenerateDebugInformation>true</GenerateDebugInformation>
106106
<TargetMachine>MachineX86</TargetMachine>
107107
</Link>
@@ -112,7 +112,7 @@
112112
</Midl>
113113
<ClCompile>
114114
<Optimization>Disabled</Optimization>
115-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-21\win32\include;$(ProjectDir)..\..\third_party\gecko-21\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
115+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\include;$(ProjectDir)..\..\third_party\gecko-22\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
116116
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117117
<MinimalRebuild>true</MinimalRebuild>
118118
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -122,7 +122,7 @@
122122
</ClCompile>
123123
<Link>
124124
<AdditionalDependencies>nspr4.lib;xpcom.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
125-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-21\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
125+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
126126
<GenerateDebugInformation>true</GenerateDebugInformation>
127127
<TargetMachine>MachineX64</TargetMachine>
128128
</Link>
@@ -131,7 +131,7 @@
131131
<ClCompile>
132132
<Optimization>MaxSpeed</Optimization>
133133
<IntrinsicFunctions>true</IntrinsicFunctions>
134-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-21\win32\include;$(ProjectDir)..\..\third_party\gecko-21\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
134+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\include;$(ProjectDir)..\..\third_party\gecko-22\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
135135
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136136
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
137137
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -140,8 +140,8 @@
140140
</DebugInformationFormat>
141141
</ClCompile>
142142
<Link>
143-
<AdditionalDependencies>nspr4.lib;xpcom.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
144-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-21\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
143+
<AdditionalDependencies>xul.lib;nss3.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
144+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
145145
<GenerateDebugInformation>false</GenerateDebugInformation>
146146
<OptimizeReferences>true</OptimizeReferences>
147147
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -155,7 +155,7 @@
155155
<ClCompile>
156156
<Optimization>MaxSpeed</Optimization>
157157
<IntrinsicFunctions>true</IntrinsicFunctions>
158-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-21\win32\include;$(ProjectDir)..\..\third_party\gecko-21\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
158+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\include;$(ProjectDir)..\..\third_party\gecko-22\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
159159
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160160
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
161161
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -164,7 +164,7 @@
164164
</ClCompile>
165165
<Link>
166166
<AdditionalDependencies>nspr4.lib;xpcom.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
167-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-21\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
167+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-22\win32\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
168168
<GenerateDebugInformation>true</GenerateDebugInformation>
169169
<OptimizeReferences>true</OptimizeReferences>
170170
<EnableCOMDATFolding>true</EnableCOMDATFolding>

0 commit comments

Comments
 (0)