Skip to content

Commit 3d6d7e5

Browse files
barancevbarancev
committed
Updating build files for FF30
1 parent 78097ff commit 3d6d7e5

File tree

6 files changed

+40
-28
lines changed

6 files changed

+40
-28
lines changed

‎Rakefile

+12
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,18 @@ GeckoSDKs.new do |sdks|
336336
sdks.add 'third_party/gecko-29/win32',
337337
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/29.0/sdk/xulrunner-29.0.en-US.win32.sdk.zip',
338338
'b2009f64cfa997887b341f5603abeaac'
339+
340+
sdks.add 'third_party/gecko-30/linux',
341+
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/30.0/sdk/xulrunner-30.0.en-US.linux-i686.sdk.tar.bz2',
342+
'c32ab5a6fe69ced785bb5813b129c3bf'
343+
344+
sdks.add 'third_party/gecko-30/linux64',
345+
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/30.0/sdk/xulrunner-30.0.en-US.linux-x86_64.sdk.tar.bz2',
346+
'2bd022924e5b44b00cb4637caa78e034'
347+
348+
sdks.add 'third_party/gecko-30/win32',
349+
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/30.0/sdk/xulrunner-30.0.en-US.win32.sdk.zip',
350+
'de6d8bd08b6ccce7e83493626750c055'
339351
end
340352

341353
task :'selenium-server_zip' do

‎cpp/build.desc

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,28 +48,28 @@ mozilla_lib(name = "webdriver_firefox_previous",
4848
"webdriver-interactions/interactions_common.*",
4949
"webdriver-firefox/*.cpp"],
5050
arch = "i386",
51-
geckoversion="28")
51+
geckoversion="29")
5252

5353
mozilla_lib(name = "webdriver_firefox_previous_64",
5454
srcs = [ "webdriver-interactions/*_linux*.cpp",
5555
"webdriver-interactions/interactions_common.*",
5656
"webdriver-firefox/*.cpp"],
5757
arch = "amd64",
58-
geckoversion="28")
58+
geckoversion="29")
5959

6060
mozilla_lib(name = "webdriver_firefox_latest",
6161
srcs = [ "webdriver-interactions/*_linux*.cpp",
6262
"webdriver-interactions/interactions_common.*",
6363
"webdriver-firefox/*.cpp"],
6464
arch = "i386",
65-
geckoversion="29")
65+
geckoversion="30")
6666

6767
mozilla_lib(name = "webdriver_firefox_latest_64",
6868
srcs = [ "webdriver-interactions/*_linux*.cpp",
6969
"webdriver-interactions/interactions_common.*",
7070
"webdriver-firefox/*.cpp"],
7171
arch = "amd64",
72-
geckoversion="29")
72+
geckoversion="30")
7373

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

‎cpp/webdriver-firefox/build.desc

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ visualc_library(name = "latest_esr",
1515
visualc_library(name = "previous",
1616
platform = "Win32",
1717
project = "webdriver-firefox-previous.vcxproj",
18-
file_deps = "third_party/gecko-28/win32",
18+
file_deps = "third_party/gecko-29/win32",
1919
out = "Win32/Release/webdriver-firefox-previous.dll"
2020
)
2121

2222
visualc_library(name = "latest",
2323
platform = "Win32",
2424
project = "webdriver-firefox-latest.vcxproj",
25-
file_deps = "third_party/gecko-29/win32",
25+
file_deps = "third_party/gecko-30/win32",
2626
out = "Win32/Release/webdriver-firefox-latest.dll"
2727
)

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

+8-8
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-29\win32\include;$(ProjectDir)..\..\third_party\gecko-29\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
94+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-30\win32\include;$(ProjectDir)..\..\third_party\gecko-30\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>nss3.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
104-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-29\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
104+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-30\win32\lib;%(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-29\win32\include;$(ProjectDir)..\..\third_party\gecko-29\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
115+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-30\win32\include;$(ProjectDir)..\..\third_party\gecko-30\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>nss3.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
125-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-29\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
125+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-30\win32\lib;%(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-29\win32\include;$(ProjectDir)..\..\third_party\gecko-29\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
134+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-30\win32\include;$(ProjectDir)..\..\third_party\gecko-30\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>nss3.lib;xul.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
144-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-29\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
144+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-30\win32\lib;%(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-29\win32\include;$(ProjectDir)..\..\third_party\gecko-29\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
158+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-30\win32\include;$(ProjectDir)..\..\third_party\gecko-30\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>nss3.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
167-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-29\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
167+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-30\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
168168
<GenerateDebugInformation>true</GenerateDebugInformation>
169169
<OptimizeReferences>true</OptimizeReferences>
170170
<EnableCOMDATFolding>true</EnableCOMDATFolding>

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

+8-8
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-28\win32\include;$(ProjectDir)..\..\third_party\gecko-28\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
94+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-29\win32\include;$(ProjectDir)..\..\third_party\gecko-29\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>nss3.lib;xul.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
104-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-28\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
104+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-29\win32\lib;%(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-28\win32\include;$(ProjectDir)..\..\third_party\gecko-28\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
115+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-29\win32\include;$(ProjectDir)..\..\third_party\gecko-29\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>nss3.lib;xul.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
125-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-28\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
125+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-29\win32\lib;%(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-28\win32\include;$(ProjectDir)..\..\third_party\gecko-28\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
134+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-29\win32\include;$(ProjectDir)..\..\third_party\gecko-29\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>nss3.lib;xul.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
144-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-28\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
144+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-29\win32\lib;%(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-28\win32\include;$(ProjectDir)..\..\third_party\gecko-28\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
158+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-29\win32\include;$(ProjectDir)..\..\third_party\gecko-29\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>nss3.lib;xul.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
167-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-28\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
167+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\third_party\gecko-29\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
168168
<GenerateDebugInformation>true</GenerateDebugInformation>
169169
<OptimizeReferences>true</OptimizeReferences>
170170
<EnableCOMDATFolding>true</EnableCOMDATFolding>

‎javascript/firefox-driver/extension/chrome.manifest

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ contract @googlecode.com/webdriver/modifierkeys;1 {2E4B69B9-21FE-48ad-A2F6-AB355
4747

4848
contract @googlecode.com/webdriver/syntheticmouse;1 {E8F9FEFE-C513-4097-98BE-BE00A41D3645}
4949

50-
binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-latest.dll ABI=WINNT_x86-msvc appversion>=29
51-
binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-previous.dll ABI=WINNT_x86-msvc appversion>=28 platformversion<29
50+
binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-latest.dll ABI=WINNT_x86-msvc appversion>=30
51+
binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-previous.dll ABI=WINNT_x86-msvc appversion>=29 platformversion<30
5252
binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-esr-latest.dll ABI=WINNT_x86-msvc appversion>=24 platformversion<25
5353
binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-esr-previous.dll ABI=WINNT_x86-msvc appversion>=17 platformversion<18
5454

5555
binary-component platform/WINNT_x86-msvc/components/imehandler.dll ABI=WINNT_x86-msvc
5656

57-
binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-latest.so ABI=Linux_x86_64-gcc3 appversion>=29
58-
binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-previous.so ABI=Linux_x86_64-gcc3 appversion>=28 platformversion<29
57+
binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-latest.so ABI=Linux_x86_64-gcc3 appversion>=30
58+
binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-previous.so ABI=Linux_x86_64-gcc3 appversion>=29 platformversion<30
5959
binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-latest.so ABI=Linux_x86_64-gcc3 appversion>=24 platformversion<25
6060
binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-previous.so ABI=Linux_x86_64-gcc3 appversion>=17 platformversion<18
6161

62-
binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-latest.so ABI=Linux_x86-gcc3 appversion>=29
63-
binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-previous.so ABI=Linux_x86-gcc3 appversion>=28 platformversion<29
62+
binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-latest.so ABI=Linux_x86-gcc3 appversion>=30
63+
binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-previous.so ABI=Linux_x86-gcc3 appversion>=29 platformversion<30
6464
binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-latest.so ABI=Linux_x86-gcc3 appversion>=24 platformversion<25
6565
binary-component platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-previous.so ABI=Linux_x86-gcc3 appversion>=17 platformversion<18

0 commit comments

Comments
 (0)