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

License Correction #165

Merged
merged 2 commits into from
Jul 11, 2021
Merged

License Correction #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ee7d29
Edited license to reflect the change in development, and merge_all to…
The-EDev Jul 10, 2021
4710c10
fixed comment problem
The-EDev Jul 10, 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
3 changes: 2 additions & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Copyright (c) 2014, ipkn
Copyright (c) 2014-2017, ipkn
2020-2021, CrowCpp
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
6 changes: 4 additions & 2 deletions scripts/merge_all.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

middlewares = [x.rsplit(sep, 1)[-1][:-2] for x in glob(pt.join(header_path, ('crow'+sep+'middlewares'+sep+'*.h*')))]

with open(header_path+'/../LICENSE', 'r') as file:
lsc = '/*' + file.read() + '*/'

middlewares_actual = []
if len(sys.argv) > 3:
Expand Down Expand Up @@ -83,10 +85,10 @@ def dfs(x):
assert order.index(x) < order.index(y), 'cyclic include detected'

print(order)
build = []
build = [lsc]
for header in order:
d = open(pt.join(header_path, header)).read()
build.append(re_depends.sub(lambda x: '\n', d))
build.append('\n')

open(output_path, 'w').write('\n'.join(build))
open(output_path, 'w').write('\n'.join(build))