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.

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

Upgrade to berp 1.3, remove dependency to mono #1542

Merged
merged 27 commits into from
May 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3205a90
improve Gherkin make process
gasparnagy May 14, 2021
8836bae
test using berp from nuget
gasparnagy May 14, 2021
c7f771b
fix berp access path
gasparnagy May 14, 2021
b73a50a
Merge branch 'master' into upgrade_berp
gasparnagy May 14, 2021
b086d6d
improve berp access
gasparnagy May 14, 2021
553d9fa
Change file permissions from 100644 to 100755
May 14, 2021
62ef4c8
Merge branch 'master' into upgrade_berp
aslakhellesoy May 14, 2021
ce3caad
Merge branch 'master' into upgrade_berp
aslakhellesoy May 14, 2021
5cbcb02
Merge branch 'master' into upgrade_berp
aslakhellesoy May 15, 2021
0abee1f
Merge remote-tracking branch 'origin/master' into upgrade_berp
gasparnagy May 18, 2021
8d40e1f
move berp stuff to default.mk
gasparnagy May 18, 2021
198a132
use new berp for all platforms
gasparnagy May 18, 2021
bba7f6b
Test Java with order-only dependency
gasparnagy May 18, 2021
9da31b2
Another try with canned recipes
gasparnagy May 18, 2021
0949bd5
Moved java berp canned recipe to default.mk
gasparnagy May 18, 2021
ab97f32
Use canned berp recipes for all platforms
gasparnagy May 18, 2021
27f52b1
regenerate parsers with berp 1.3.0, except objective-c, elixir, perl,…
gasparnagy May 18, 2021
3faef80
make grammar file location configurable
gasparnagy May 18, 2021
a685667
give a try with the regenerated elixir parser
gasparnagy May 18, 2021
a74aaf7
Undo regenerating ruby parser
gasparnagy May 18, 2021
f23126c
Fix perl parser generation
gasparnagy May 19, 2021
74ec39d
Fix perl parser generation (2)
gasparnagy May 19, 2021
1e751df
Fix ruby parser generation
gasparnagy May 19, 2021
c6550b1
Razor files fixed for objective-c (parser was outdated, so not regene…
gasparnagy May 19, 2021
aea1227
Fix python parser generation
gasparnagy May 19, 2021
67113f9
Merge branch 'master' into upgrade_berp
gasparnagy May 19, 2021
b02a32c
small cleanup
gasparnagy May 19, 2021
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
10 changes: 10 additions & 0 deletions .templates/c/default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,13 @@ publish:
post-release:
# no-op
.PHONY: post-release

### COMMON stuff for all platforms

BERP_VERSION = 1.3.0
BERP_GRAMMAR = gherkin.berp

define berp-generate-parser =
-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
endef
175 changes: 175 additions & 0 deletions .templates/dotnet/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates
*.ide

# Build results

[Dd]ebug/
[Rr]elease/
x64/
build/
[Oo]bj/
*/**/bin

# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
!packages/*/build/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.Publish.xml

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/

# Windows Azure Build Output
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf


#LightSwitch generated files
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml

# =========================
# Windows detritus
# =========================

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac desktop service store files
.DS_Store

packages/
acceptance/
output/
.built
.compared
.sln_built_debug
*.userprefs
*.nupkg
Gherkin.NuGetPackages/bin/
.build*
.built*
.vscode
.run_tests
.generated
.packed
.tested
.fixprotoc
21 changes: 18 additions & 3 deletions .templates/dotnet/default.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Please update /.templates/dotnet/default.mk and sync:
#
# source scripts/functions.sh && rsync_files
#
SHELL := /usr/bin/env bash
ALPINE := $(shell which apk 2> /dev/null)
SLN_FILES = $(shell find . -name "*.sln")
Expand Down Expand Up @@ -26,7 +30,7 @@ else
endif

.built: $(SLN_FILES) $(CSPROJ_FILES) $(CSHARP_SOURCE_FILES) .generated
dotnet build -bl -c Release -p:SnapshotSuffix="$(SNAPSHOT_SUFFIX)"
dotnet build -c Release -p:SnapshotSuffix="$(SNAPSHOT_SUFFIX)"
touch $@

.generated:
Expand All @@ -37,14 +41,13 @@ endif
touch $@

.packed: .tested
dotnet pack -c Release -p:SnapshotSuffix="$(SNAPSHOT_SUFFIX)"
touch $@

# Define SNAPSHOT_SUFFIX to make pre-release: export SNAPSHOT_SUFFIX=beta-1 make publish
publish: .packed
ifdef NUGET_API_KEY
# https://circleci.com/gh/cucumber/cucumber/edit#env-vars
@dotnet nuget push --source https://api.nuget.org/v3/index.json --api-key "${NUGET_API_KEY}" $(shell find GeneratedNuGetPackages/Release -name "*.$(NEW_VERSION).nupkg")
@dotnet nuget push --source https://api.nuget.org/v3/index.json --api-key "${NUGET_API_KEY}" $(shell find */bin/Release/NuGet -name "*.$(NEW_VERSION).nupkg")
else
@echo -e "\033[0;31mNUGET_API_KEY is not defined. Can't publish :-(\033[0m"
exit 1
Expand All @@ -59,4 +62,16 @@ clean: clean-dotnet

clean-dotnet:
rm -rf .generated .tested .built .packed GeneratedNuGetPackages
rm -rf */bin
rm -rf */obj
.PHONY: clean-dotnet

### COMMON stuff for all platforms

BERP_VERSION = 1.3.0
BERP_GRAMMAR = gherkin.berp

define berp-generate-parser =
-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
endef
10 changes: 10 additions & 0 deletions .templates/elixir/default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,13 @@ post-release: comment_remote_dependency uncomment_local_dependency

clean:
rm -rf _build deps .deps .tested

### COMMON stuff for all platforms

BERP_VERSION = 1.3.0
BERP_GRAMMAR = gherkin.berp

define berp-generate-parser =
-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
endef
10 changes: 10 additions & 0 deletions .templates/go/default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,13 @@ else
sed -Ei "s/$(LIBNAME)-go(\/v$(CURRENT_MAJOR))?/$(LIBNAME)-go\/v$(NEW_MAJOR)/" $(shell find . -name "*.go")
endif
.PHONY: update-major

### COMMON stuff for all platforms

BERP_VERSION = 1.3.0
BERP_GRAMMAR = gherkin.berp

define berp-generate-parser =
-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
endef
10 changes: 10 additions & 0 deletions .templates/java/default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,13 @@ clean-java:
rm -rf target .deps .tested* .built acceptance
mvn clean
.PHONY: clean-java

### COMMON stuff for all platforms

BERP_VERSION = 1.3.0
BERP_GRAMMAR = gherkin.berp

define berp-generate-parser =
-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
endef
10 changes: 10 additions & 0 deletions .templates/javascript/default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,13 @@ clean-javascript:
clobber: clean
rm -rf node_modules ../../node_modules
.PHONY: clobber

### COMMON stuff for all platforms

BERP_VERSION = 1.3.0
BERP_GRAMMAR = gherkin.berp

define berp-generate-parser =
-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
endef
16 changes: 16 additions & 0 deletions .templates/objective-c/default.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Please update /.templates/objective-c/default.mk and sync:
#
# source scripts/functions.sh && rsync_files
#
SHELL := /usr/bin/env bash
ALPINE := $(shell which apk 2> /dev/null)

### COMMON stuff for all platforms

BERP_VERSION = 1.3.0
BERP_GRAMMAR = gherkin.berp

define berp-generate-parser =
-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
endef
16 changes: 16 additions & 0 deletions .templates/perl/default.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Please update /.templates/perl/default.mk and sync:
#
# source scripts/functions.sh && rsync_files
#
SHELL := /usr/bin/env bash
ALPINE := $(shell which apk 2> /dev/null)

### COMMON stuff for all platforms

BERP_VERSION = 1.3.0
BERP_GRAMMAR = gherkin.berp

define berp-generate-parser =
-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
endef
10 changes: 10 additions & 0 deletions .templates/python/default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,13 @@ endif
post-release:
@echo "No post-release needed for python"
.PHONY: post-release

### COMMON stuff for all platforms

BERP_VERSION = 1.3.0
BERP_GRAMMAR = gherkin.berp

define berp-generate-parser =
-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
endef
10 changes: 10 additions & 0 deletions .templates/ruby/default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,13 @@ clean: clean-ruby
clean-ruby:
rm -rf .deps .linked .tested* Gemfile.lock *.gem acceptance
.PHONY: clean-ruby

### COMMON stuff for all platforms

BERP_VERSION = 1.3.0
BERP_GRAMMAR = gherkin.berp

define berp-generate-parser =
-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
endef
10 changes: 10 additions & 0 deletions compatibility-kit/javascript/default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,13 @@ clean-javascript:
clobber: clean
rm -rf node_modules ../../node_modules
.PHONY: clobber

### COMMON stuff for all platforms

BERP_VERSION = 1.3.0
BERP_GRAMMAR = gherkin.berp

define berp-generate-parser =
-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
endef
10 changes: 10 additions & 0 deletions compatibility-kit/ruby/default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,13 @@ clean: clean-ruby
clean-ruby:
rm -rf .deps .linked .tested* Gemfile.lock *.gem acceptance
.PHONY: clean-ruby

### COMMON stuff for all platforms

BERP_VERSION = 1.3.0
BERP_GRAMMAR = gherkin.berp

define berp-generate-parser =
-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
endef
Loading