Skip to content

Commit

Permalink
0.0.2w
Browse files Browse the repository at this point in the history
  • Loading branch information
@springkim
springkim committed Mar 6, 2020
1 parent 4e9ceca commit 929cc47
Show file tree
Hide file tree
Showing 7 changed files with 139 additions and 6 deletions.
129 changes: 129 additions & 0 deletions cmake-build-release/cip.cbp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6"/>
<Project>
<Option title="cip"/>
<Option makefile_is_custom="1"/>
<Option compiler="gcc"/>
<Option virtualFolders="CMake Files\;CMake Files\prj_cip\;"/>
<Build>
<Target title="all">
<Option working_dir="I:/code/cip/cmake-build-release"/>
<Option type="4"/>
<MakeCommands>
<Build command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/Makefile&quot; VERBOSE=1 all"/>
<CompileFile command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/Makefile&quot; VERBOSE=1 &quot;$file&quot;"/>
<Clean command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/Makefile&quot; VERBOSE=1 clean"/>
<DistClean command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/Makefile&quot; VERBOSE=1 clean"/>
</MakeCommands>
</Target>
<Target title="edit_cache">
<Option working_dir="I:/code/cip/cmake-build-release"/>
<Option type="4"/>
<MakeCommands>
<Build command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/Makefile&quot; VERBOSE=1 edit_cache"/>
<CompileFile command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/Makefile&quot; VERBOSE=1 &quot;$file&quot;"/>
<Clean command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/Makefile&quot; VERBOSE=1 clean"/>
<DistClean command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/Makefile&quot; VERBOSE=1 clean"/>
</MakeCommands>
</Target>
<Target title="rebuild_cache">
<Option working_dir="I:/code/cip/cmake-build-release"/>
<Option type="4"/>
<MakeCommands>
<Build command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/Makefile&quot; VERBOSE=1 rebuild_cache"/>
<CompileFile command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/Makefile&quot; VERBOSE=1 &quot;$file&quot;"/>
<Clean command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/Makefile&quot; VERBOSE=1 clean"/>
<DistClean command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/Makefile&quot; VERBOSE=1 clean"/>
</MakeCommands>
</Target>
<Target title="cip">
<Option output="I:/code/cip/cmake-build-release/prj_cip/cip.exe" prefix_auto="0" extension_auto="0"/>
<Option working_dir="I:/code/cip/cmake-build-release/prj_cip"/>
<Option object_output="./"/>
<Option type="1"/>
<Option compiler="gcc"/>
<Compiler>
<Add option="-DNOMINMAX"/>
<Add option="-DUSE_7Z"/>
<Add directory="I:/code/cip/include"/>
<Add directory="C:/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/8.1.0/include/c++"/>
<Add directory="C:/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/8.1.0/include/c++/x86_64-w64-mingw32"/>
<Add directory="C:/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/8.1.0/include/c++/backward"/>
<Add directory="C:/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/8.1.0/include"/>
<Add directory="C:/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/8.1.0/include-fixed"/>
<Add directory="C:/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/8.1.0/../../../../x86_64-w64-mingw32/include"/>
</Compiler>
<MakeCommands>
<Build command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/prj_cip/Makefile&quot; VERBOSE=1 cip"/>
<CompileFile command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/prj_cip/Makefile&quot; VERBOSE=1 &quot;$file&quot;"/>
<Clean command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/prj_cip/Makefile&quot; VERBOSE=1 clean"/>
<DistClean command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/prj_cip/Makefile&quot; VERBOSE=1 clean"/>
</MakeCommands>
</Target>
<Target title="cip/fast">
<Option output="I:/code/cip/cmake-build-release/prj_cip/cip.exe" prefix_auto="0" extension_auto="0"/>
<Option working_dir="I:/code/cip/cmake-build-release/prj_cip"/>
<Option object_output="./"/>
<Option type="1"/>
<Option compiler="gcc"/>
<Compiler>
<Add option="-DNOMINMAX"/>
<Add option="-DUSE_7Z"/>
<Add directory="I:/code/cip/include"/>
<Add directory="C:/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/8.1.0/include/c++"/>
<Add directory="C:/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/8.1.0/include/c++/x86_64-w64-mingw32"/>
<Add directory="C:/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/8.1.0/include/c++/backward"/>
<Add directory="C:/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/8.1.0/include"/>
<Add directory="C:/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/8.1.0/include-fixed"/>
<Add directory="C:/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/8.1.0/../../../../x86_64-w64-mingw32/include"/>
</Compiler>
<MakeCommands>
<Build command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/prj_cip/Makefile&quot; VERBOSE=1 cip/fast"/>
<CompileFile command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/prj_cip/Makefile&quot; VERBOSE=1 &quot;$file&quot;"/>
<Clean command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/prj_cip/Makefile&quot; VERBOSE=1 clean"/>
<DistClean command="C:/mingw64/bin/mingw32-make.exe -f &quot;I:/code/cip/cmake-build-release/prj_cip/Makefile&quot; VERBOSE=1 clean"/>
</MakeCommands>
</Target>
</Build>
<Unit filename="I:/code/cip/prj_cip/argument.cpp">
<Option target="cip"/>
</Unit>
<Unit filename="I:/code/cip/prj_cip/argument.h">
<Option target="cip"/>
</Unit>
<Unit filename="I:/code/cip/prj_cip/ccpath.cpp">
<Option target="cip"/>
</Unit>
<Unit filename="I:/code/cip/prj_cip/ccpath.h">
<Option target="cip"/>
</Unit>
<Unit filename="I:/code/cip/prj_cip/downloader.h">
<Option target="cip"/>
</Unit>
<Unit filename="I:/code/cip/prj_cip/main.cpp">
<Option target="cip"/>
</Unit>
<Unit filename="I:/code/cip/prj_cip/package_list.cpp">
<Option target="cip"/>
</Unit>
<Unit filename="I:/code/cip/prj_cip/package_list.h">
<Option target="cip"/>
</Unit>
<Unit filename="I:/code/cip/prj_cip/parser.cpp">
<Option target="cip"/>
</Unit>
<Unit filename="I:/code/cip/prj_cip/parser.h">
<Option target="cip"/>
</Unit>
<Unit filename="I:/code/cip/src/jsoncpp.cpp">
<Option target="cip"/>
</Unit>
<Unit filename="I:/code/cip/CMakeLists.txt">
<Option virtualFolder="CMake Files\"/>
</Unit>
<Unit filename="I:/code/cip/prj_cip/CMakeLists.txt">
<Option virtualFolder="CMake Files\prj_cip\"/>
</Unit>
</Project>
</CodeBlocks_project_file>
Binary file added cmake-build-release/prj_cip/cip.exe
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion include/ispring
Submodule ispring updated 3 files
+4 −2 Compression.h
+121 −0 modules/Compression/7zext.h
+2 −11 unittest/main.cpp
4 changes: 2 additions & 2 deletions prj_cip/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ add_executable(cip ${SRC_FILES})
target_include_directories(cip PUBLIC ${CMAKE_SOURCE_DIR}/include)

add_definitions(-DNOMINMAX)

add_definitions(-DUSE_7Z)

if(${CMAKE_CXX_COMPILER_ID} MATCHES GNU AND ${CMAKE_SYSTEM_NAME} MATCHES Windows )
target_link_libraries(cip shlwapi urlmon wininet)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -static-libgcc -static-libstdc++")
endif()
if(${CMAKE_CXX_COMPILER_ID} MATCHES GNU AND ${CMAKE_SYSTEM_NAME} MATCHES Linux )
target_link_libraries(cip pthread stdc++fs)
add_compile_options(-lstdc++fs -std=c++17)
endif()
2 changes: 1 addition & 1 deletion prj_cip/ccpath.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include<Windows.h>
#include<urlmon.h> //URLDownloadToFileA
#include <Shlwapi.h>
#include<Shlwapi.h>
#include<shlobj.h>


Expand Down
6 changes: 5 additions & 1 deletion prj_cip/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@

#include<ispring/System.h>
#include"ccpath.h"
#include"downloader.h"
#include"parser.h"


int main(int argc,char* argv[]){
if(!ispring::OS::isAdmin()){
std::cout << ispring::xout.light_red << "cip requires admin privileges to run" << ispring::xout.white << std::endl;
return 1;
}
init_hasargoption();
parse_command(argc,argv);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion prj_cip/parser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
extern Args args;
extern std::set<std::string> hasargoption;
void print_version(){
std::string version="0.0.1";
std::string version="0.0.2";
std::cout << "cip " << version << std::endl;
}
void init_hasargoption(){
Expand Down

0 comments on commit 929cc47

Please sign in to comment.