pvoid/astyle-port
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs::absolute, units, Makefile fixes

Browse Source
This commit is contained in:
pvoid committed 2025-11-30 23:59:27 +03:00
1 parent 8eac1e7846
commit ccbfdbb535
4 files changed
+20 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile
+3 -11
View File
@@ -8,7 +8,7 @@ INCLUDE:=-I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/libstdc
LDFLAGS:=-static -S -Tapp-dynamic.lds --image-base 0 LDFLAGS:=-static -S -Tapp-dynamic.lds --image-base 0
LIBPATH:=-L $(SDK_DIR)/lib -L /usr/local/kos32/lib LIBPATH:=-L $(SDK_DIR)/lib -L /usr/local/kos32/lib
all: compile link make_iso copy_iso all: compile link make_iso
compile: compile:
$(CXX) $(CXXFLAGS) $(INCLUDE) -o ASBeautifier.o ASBeautifier.cpp $(CXX) $(CXXFLAGS) $(INCLUDE) -o ASBeautifier.o ASBeautifier.cpp
@@ -24,7 +24,7 @@ compile:
$(CC) $(CFLAGS) $(INCLUDE) -o closedir.o $(SDK_DIR)/sources/newlib/libc/posix/closedir.c $(CC) $(CFLAGS) $(INCLUDE) -o closedir.o $(SDK_DIR)/sources/newlib/libc/posix/closedir.c
clean: clean:
rm -f unit.o filesystem.o opendir.o readdir.o closedir.o unit iso app.iso rm -vf *.o app.iso astyle
link: link:
$(LD) $(LDFLAGS) $(LIBPATH) \ $(LD) $(LDFLAGS) $(LIBPATH) \
@@ -42,12 +42,4 @@ link:
kos32-objcopy astyle -O binary kos32-objcopy astyle -O binary
make_iso: make_iso:
rm -rf iso mkisofs -appid KolibriTestApp -volid KolibriTestApp -XA -sysid KOLIBRI -publisher pvoid -volset-size 1 -volset-seqno 1 -iso-level 3 -J -o app.iso astyle
mkdir -p iso
cp astyle iso/
mkisofs -appid KolibriTestApp -volid KolibriTestApp -XA -sysid KOLIBRI -publisher pvoid -volset-size 1 -volset-seqno 1 -iso-level 3 -J -o app.iso iso/astyle
rm -rf iso
copy_iso:
rm -f /mnt/e/app.iso
cp app.iso /mnt/e/
Makefile.unit
+3 -7
View File
@@ -8,7 +8,7 @@ INCLUDE:=-I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/libstdc
LDFLAGS:=-static -S -Tapp-dynamic.lds --image-base 0 LDFLAGS:=-static -S -Tapp-dynamic.lds --image-base 0
LIBPATH:=-L $(SDK_DIR)/lib -L /usr/local/kos32/lib LIBPATH:=-L $(SDK_DIR)/lib -L /usr/local/kos32/lib
all: compile link make_iso copy_iso all: compile link make_iso
compile: compile:
$(CXX) $(CXXFLAGS) $(INCLUDE) -o unit.o unit.cpp $(CXX) $(CXXFLAGS) $(INCLUDE) -o unit.o unit.cpp
@@ -18,7 +18,7 @@ compile:
$(CC) $(CFLAGS) $(INCLUDE) -o closedir.o $(SDK_DIR)/sources/newlib/libc/posix/closedir.c $(CC) $(CFLAGS) $(INCLUDE) -o closedir.o $(SDK_DIR)/sources/newlib/libc/posix/closedir.c
clean: clean:
rm -f unit.o filesystem.o opendir.o readdir.o closedir.o unit iso app.iso rm -vf *.o unit unit.iso
link: link:
$(LD) $(LDFLAGS) $(LIBPATH) unit.o filesystem.o opendir.o readdir.o closedir.o -o unit -lstdc++ -lsupc++ -lgcc -lc.dll $(LD) $(LDFLAGS) $(LIBPATH) unit.o filesystem.o opendir.o readdir.o closedir.o -o unit -lstdc++ -lsupc++ -lgcc -lc.dll
@@ -26,8 +26,4 @@ link:
kos32-objcopy unit -O binary kos32-objcopy unit -O binary
make_iso: make_iso:
rm -rf iso mkisofs -appid KolibriTestApp -volid KolibriTestApp -XA -sysid KOLIBRI -publisher pvoid -volset-size 1 -volset-seqno 1 -iso-level 3 -J -o unit.iso unit
mkdir -p iso
cp unit iso/
mkisofs -appid KolibriTestApp -volid KolibriTestApp -XA -sysid KOLIBRI -publisher pvoid -volset-size 1 -volset-seqno 1 -iso-level 3 -J -o unit.iso iso/unit
rm -rf iso
filesystem.cpp
+6 -1
View File
@@ -42,7 +42,12 @@ path current_path()
path absolute(path const& p) path absolute(path const& p)
{ {
return p; // TODO if(p.empty() || is_absolute(p))
{
return p;
}
return current_path() / p;
} }
void scan_directory (path const& directory, std::list<path>& paths) void scan_directory (path const& directory, std::list<path>& paths)
unit.cpp
+8
View File
@@ -77,6 +77,14 @@ TEST(PathFileName)
ASSERT_EQUAL(fs::path(TestData::fs::sysPath).filename().string(), "sys"); ASSERT_EQUAL(fs::path(TestData::fs::sysPath).filename().string(), "sys");
} }
TEST(PathAbsolute)
{
ASSERT_EQUAL(fs::absolute(TestData::fs::emptyPath).string(), TestData::fs::emptyPath);
ASSERT_EQUAL(fs::absolute(TestData::fs::calcPath).string(), TestData::fs::calcPath);
ASSERT_EQUAL(fs::absolute(TestData::fs::calcFileName).string(), (fs::current_path() / TestData::fs::calcFileName).string());
ASSERT_EQUAL(fs::absolute(TestData::fs::rootPath).string(), TestData::fs::rootPath);
}
// just for cli output // just for cli output
TEST(ScanDirectory) TEST(ScanDirectory)
{ {