Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old PHP target #6604

Closed
wants to merge 4 commits into from
Closed

Remove old PHP target #6604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
beb3fe2
remove old PHP generator
Simn Sep 22, 2017
6aa69ac
remove failing test
Simn Sep 22, 2017
9c6b74c
Merge branch 'development' into rip_php
Simn Sep 24, 2017
828da80
remove more PHP code
Simn Sep 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ matrix:
#########
- os: linux
env:
- TEST=macro,neko,js,php,php7,flash9,as3,java,cs,python,hl,lua
- TEST=macro,neko,js,php7,flash9,as3,java,cs,python,hl,lua
- DEPLOY_API_DOCS=1
- DEPLOY_NIGHTLIES=1
# - SAUCE=1
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ environment:
secure: ewwkKcjnSKl/Vtrz1SXmI6XKk1ENmJDyzm5YaR2wi03foRhTke29TvymB21rDTSl
matrix:
- ARCH: 64
TEST: "neko,python,cs,java,php7,php,macro"
TEST: "neko,python,cs,java,php7,macro"
DEPLOY_NIGHTLIES: 1
- ARCH: 64
TEST: "cpp"
Expand Down
16 changes: 4 additions & 12 deletions src/compiler/main.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,14 +242,9 @@ module Initialize = struct
add_std "lua";
"lua"
| Php ->
if Common.is_php7 com then
begin
com.package_rules <- PMap.add "php" (Directory "php7") com.package_rules;
com.package_rules <- PMap.add "php7" Forbidden com.package_rules;
add_std "php7"
end
else
add_std "php";
com.package_rules <- PMap.add "php" (Directory "php7") com.package_rules;
com.package_rules <- PMap.add "php7" Forbidden com.package_rules;
add_std "php7";
"php"
| Cpp ->
Common.define_value com Define.HxcppApiLevel "332";
Expand Down Expand Up @@ -321,10 +316,7 @@ let generate tctx ext xml_out interp swf_header =
| Lua ->
Genlua.generate,"lua"
| Php ->
if Common.is_php7 com then
Genphp7.generate,"php"
else
Genphp.generate,"php"
Genphp7.generate,"php"
| Cpp ->
Gencpp.generate,"cpp"
| Cs ->
Expand Down
17 changes: 4 additions & 13 deletions src/context/common.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,6 @@ let get_signature com =
com.defines_signature <- Some s;
s

let is_php7 com = com.platform = Php && PMap.exists "php7" com.defines

module CompilationServer = struct
type cache = {
c_haxelib : (string list, string list) Hashtbl.t;
Expand Down Expand Up @@ -756,17 +754,10 @@ let get_config com =
pf_reserved_type_paths = [([],"Object");([],"Error")];
}
| Php ->
if is_php7 com then
{
default_config with
pf_static = false;
}
else
{
default_config with
pf_static = false;
pf_pad_nulls = true;
}
{
default_config with
pf_static = false;
}
| Cpp ->
{
default_config with
Expand Down
Loading