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

Jump to bottom

Installation improvements #723

Merged
merged 103 commits into from
Mar 21, 2017
Merged

Installation improvements #723

merged 103 commits into from
Mar 21, 2017

Conversation

TheJJ
Copy link
Member

@TheJJ TheJJ commented Jan 26, 2017 •
edited
Loading

  • normalize python prefix (fixes Normalize install prefixes in cmake #690)
  • install game launcher (fixes Install global game binary #709)
  • blacklist pythontex.py (fixes blacklist pythontex in the buildsystem #708)
  • cache locating python and python modules
  • ninja build system support
  • enable repo assets directory depending on devmode
  • union-mount all possible asset search paths (/usr/share, /home, --assets, ...)
  • modernized file reading
    • use std::istream, std::getline etc
  • filesystem abstraction c++ interface (Filesystem abstraction C++ interface #630)
    • abstraction layer through python
    • abstraction layer through c++ stdlib
    • filelike support through python
      • reading
      • writing
    • filelike support through c++ stdlib
      • reading
      • writing
    • wrapping the C++ api for python
      • the c++ objects can be passed again to python
      • filesystemlike and filelike api must be wrapped in the other direction again
  • integrate util::Path all over the codebase
    • reading QML files and watch root dir
    • improve docx reading
    • audio manager
    • asset manager
      • texture loading
      • sound loading
  • generic .call() method for python objects
  • random fixes and improvements
  • integration of Update unit.py #718 because this pullrequests requires a reconversion anyways
  • visgrep interface cutter optimizations (faster by factor ~50)
  • slp parser optimizations (faster by factor ~40) (fixes Write slp parser in cython #431)
  • virtual file reading for audio system
  • cvar default loading

works towards #691

@TheJJ TheJJ added area: assets Involved with assets (images, sounds, ...) area: buildsystem Related to our cmake/python buildsystem improvement Enhancement of an existing component labels Jan 26, 2017
@TheJJ TheJJ mentioned this pull request Jan 26, 2017
Closed
2 tasks
@TheJJ TheJJ force-pushed the searchpaths branch 2 times, most recently from 77fab4c to 92906b0 Compare January 27, 2017 20:29
@zuntrax zuntrax added this to the v0.4.0 milestone Jan 28, 2017
@TheJJ TheJJ force-pushed the searchpaths branch 2 times, most recently from f776e0e to 72c628c Compare February 1, 2017 10:13
@TheJJ TheJJ mentioned this pull request Feb 2, 2017
Closed
@TheJJ TheJJ force-pushed the searchpaths branch 6 times, most recently from a0eb469 to 40ba5cc Compare February 5, 2017 19:30
@TheJJ TheJJ mentioned this pull request Feb 7, 2017
Open
@TheJJ TheJJ force-pushed the searchpaths branch 2 times, most recently from 1bb36da to fda12d8 Compare February 12, 2017 23:46
@TheJJ TheJJ mentioned this pull request Feb 13, 2017
Closed
Tomatower
Tomatower reviewed Feb 13, 2017
View reviewed changes
Copy link
Contributor

@Tomatower Tomatower left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found some plain-old-C stuff that should be easy fixing and not copying data on lioad

libopenage/util/csv.h Outdated
if (unlikely(strbuf.size() <= line.size())) {
strbuf.resize(line.size() + 1);
}
memcpy(strbuf.data(), line.c_str(), line.size() + 1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why memcpy here?

std::copy(line.c_str(), line.c_str()+line.size(), std::back_inserter(strbuf));

libopenage/util/csv.h Outdated
if (unlikely(strbuf.size() <= line.size())) {
strbuf.resize(line.size() + 1);
}
memcpy(strbuf.data(), line.c_str(), line.size() + 1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

memcpy?

libopenage/util/csv.h Outdated
memcpy(strbuf.data(), line.c_str(), line.size() + 1);

// use the line copy to fill the current line struct.
int error_column = current_line_data.fill(strbuf.data());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually - Why not give the line.data() directly into the fill() method?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because the fill method will modify the data, and i think that line.c_str() is const.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does the fill method modify the data? strbuf is rewritten for every line

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was based on strtok once, not sure if it still does.

Copy link
Contributor

@Tomatower Tomatower Feb 13, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah now I see what you mean... It is finally consumed here - and there write access is required - which is still not completely broken - if the string is not modified in length one can use &line[0] - and continue to avoid any copy

libopenage/util/csv.h Outdated
memcpy(strbuf.data(), line.c_str(), line.size() + 1);

// use the line copy to fill the current line struct.
int error_column = current_line_data.fill(strbuf.data());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here - use line.data() or

@TheJJ
Copy link
Member Author

TheJJ commented Feb 13, 2017

I'll clean the whole csv reading up, it's really a mess...

This was referenced Feb 14, 2017
Closed
Open
@jonaspm
Copy link

jonaspm commented Feb 17, 2017

Hello everyone, I am liking this project but... why use docx instead of a more documented and libre option as .odt?

thanks in advance.

@elnabo
Copy link
Contributor

elnabo commented Feb 17, 2017

If I remember correctly the .docx files are in fact csv files.

@VelorumS
Copy link
Contributor

VelorumS commented Feb 17, 2017 •
edited by TheJJ
Loading

@jonaspm, in other words: it's not that docx.

@TheJJ
Copy link
Member Author

TheJJ commented Feb 17, 2017

This file suffix is purely a troll, in fact the files are just plain text. We wanted to use them as as "temporary solution" until we have nyan, but this turned out to be way more complicated, so we still have them as of today, but they will go away at least after my master thesis about nyan. 😛

This was referenced Feb 19, 2017
Closed
Closed
TheJJ added 23 commits March 21, 2017 11:44
@TheJJ
convert: optimize slp conversion
c180e6a
@TheJJ
error: ensure is always unlikely
c616ed8
@TheJJ
readme: hint to linux-steam for download
5bc800a
@TheJJ
buildsystem: executable bit for BININSTALL python files
0055d24
@TheJJ
assetmanager: don't resolve the path early
0669456 
this preserves the union but may slow things down a bit
@TheJJ
fslike: support reading to raw buffer
bb64f13
@TheJJ
audio: support virtual opus files
798c6fc
@TheJJ
cfg: install keybinding defaults to /etc
c03a3f1
@TheJJ
assets: more and less comments
6fe4186
@TheJJ
cvar: add config folder override argument
5bac7da
@TheJJ
fslike: convenience functions for native path resolving
b7fdae5
@TheJJ
buildsystem: move options helper file
73d110e
@TheJJ
configure: add option to list feature options
615156d
@TheJJ
args: add force enabling and disabling of devmode
5997021
@TheJJ
fslike: fixed guard bypass in wrapper
09022f9
@TheJJ
fslike: fix path wrapping for wrapper path resolving
bd9a979
@TheJJ
path: remove api access to path resolving
eb826d8
@TheJJ
config: ignore devmode request if config not yet generated
ad89ec4
@TheJJ
fslike: factor out common code for opening files
89108c9
@TheJJ
codegen: added some todos for internal fslike access
0523844
@TheJJ
convert: fix preview of conversion output path
703a559
@TheJJ
util: constexpr for some helper functions
108e4a2
@TheJJ
util: default to little endian for array conversions
cd5fb3e
@TheJJ TheJJ mentioned this pull request Mar 21, 2017
Closed
@TheJJ TheJJ merged commit bb4b53e into SFTtech:master Mar 21, 2017
@TheJJ TheJJ deleted the searchpaths branch March 21, 2017 20:08
@TheJJ TheJJ mentioned this pull request Mar 21, 2017
Closed
2 tasks
This was referenced Apr 5, 2017
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@goto-bus-stop goto-bus-stop goto-bus-stop left review comments

@elnabo elnabo elnabo left review comments

@mic-e mic-e Awaiting requested review from mic-e

@Tomatower Tomatower Awaiting requested review from Tomatower

Assignees
No one assigned
Labels
area: assets Involved with assets (images, sounds, ...) area: buildsystem Related to our cmake/python buildsystem improvement Enhancement of an existing component packaging Bundling openage for distribution
Projects
None yet
Milestone
v0.4.0
8 participants
@TheJJ @jonaspm @elnabo @VelorumS @goto-bus-stop @Tomatower @zuntrax @yvan-burrie