Skip to content

Commit 29f4f1f

Browse files
stefledstefled
committed
[Version] 2.10.0
script: update comments in release_version.sh feat: update grpc version to 1.71.0
1 parent f6c7f35 commit 29f4f1f

File tree

8 files changed

+54
-13
lines changed

8 files changed

+54
-13
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,7 @@ tools/xpcf_grpc_client/xpcfGrpcSampleComponentClient.xml
8484
tools/xpcf_grpc_server/grpc_server_sample.xml
8585
tools/xpcf_grpc_server/packagedependencies.txt
8686
tools/xpcf_grpc_server/xpcfGrpcSampleComponentServer.xml
87-
version.pri
87+
version.pri
88+
89+
*conanbuild*.sh
90+
*conanrun*.sh

‎packagedependencies-linux.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
boost#stable|1.84.0|boost|conan|conan-center|default|
2-
grpc|1.50.1|grpc++%WITHREMOTING|conan|conan-center|default|secure=True
2+
grpc|1.71.0|grpc++%WITHREMOTING|conan|conan-center|default|secure=True

‎packagedependencies-win.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
boost#stable|1.84.0|boost|conan|conan-center|default|
2-
grpc|1.50.1|grpc++%WITHREMOTING|conan|conan-center|static|secure=True
2+
grpc|1.71.0|grpc++%WITHREMOTING|conan|conan-center|static|secure=True

‎scripts/unixes/package_xpcf.sh.template‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ fi
4141

4242
${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcf shared ${XPCFROOT} ${QTVERSION} ${QMAKEPATH}
4343
${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcf static ${XPCFROOT} ${QTVERSION} ${QMAKEPATH}
44+
${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcf_static_deps shared ${XPCFROOT} ${QTVERSION} ${QMAKEPATH}
45+
${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcf_grpc_gen static ${XPCFROOT}/tools/generators/grpc ${QTVERSION} ${QMAKEPATH}
4446
${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcfSampleComponent shared ${XPCFROOT}/samples/sample_component ${QTVERSION} ${QMAKEPATH}
4547

4648
${XPCFROOT}/scripts/unixes/make_remaken_package.sh xpcf <version>
49+
${XPCFROOT}/scripts/unixes/make_remaken_package.sh xpcf_static_deps <version>
50+
${XPCFROOT}/scripts/unixes/make_remaken_package.sh xpcf_grpc_gen <version>
4751
${XPCFROOT}/scripts/unixes/make_remaken_package.sh xpcfSampleComponent <version>

‎scripts/unixes/release_version.sh‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/bash
2+
3+
XPCFROOT=../..
4+
version = 2.10.0
5+
6+
pushd ${XPCFROOT}
7+
scripts/unixes/update_version -f -v ${version}
8+
popd
9+
10+
./package_xpcf.sh
11+
12+
# check /home/sleduc/_dev/swe/xpcf/tools/generators/grpc/GRPCProtoGenerator.cpp for grpc and protobuf version!
13+
# => if grpc version changed => set a new xpcf_grpc_gen_bin version in https://github.com/b-com-software-basis/thirdparties-binaries/releases
14+
# with path to grpc release and protobuf (search conan local path)
15+
# zip -r -y xpcf_grpc_gen_bin.zip xpcf_grpc_gen_bin
16+
# upload zip on github
17+
18+
# upload manually on https://github.com/b-com-software-basis/xpcf/releases
19+
# - release/tag xpcf/${version}/linux
20+
# - ~/.remaken/packages/linux-gcc/static/release/xpcf_${version}_x86_64_static_release.zip
21+
# - ~/.remaken/packages/linux-gcc/static/debug/xpcf_${version}_x86_64_static_debug.zip
22+
# - ~/.remaken/packages/linux-gcc/shared/release/xpcf_${version}_x86_64_shared_release.zip
23+
# - ~/.remaken/packages/linux-gcc/shared/debug/xpcf_${version}_x86_64_shared_debug.zip
24+
# - release/tag xpcf_static_deps/${version}/linux
25+
# - ~/.remaken/packages/linux-gcc/shared/release/xpcf_static_deps_${version}_x86_64_shared_release.zip
26+
# - ~/.remaken/packages/linux-gcc/shared/debug/xpcf_static_deps_${version}_x86_64_shared_debug.zip
27+
# - release/tag xpcf_grpc_gen/${version}/linux
28+
# - ~/.remaken/packages/linux-gcc/static/releasexpcf_grpc_gen_2.10.0_x86_64_static_release.zip
29+
# - ~/.remaken/packages/linux-gcc/static/debug/xpcf_grpc_gen_2.10.0_x86_64_static_debug.zip

‎scripts/unixes/update_version.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ then
6262
# Remove template extension
6363
outFile=${i%.template}
6464

65-
if [[ $outFile == *.sh ]]
66-
then
67-
chmod +x $outFile
68-
fi
69-
7065
if [[ "$clean" == true ]]
7166
then
7267
rm $outFile
@@ -78,6 +73,11 @@ then
7873
else
7974
echo "no replacement of $outFile"
8075
fi
76+
77+
if [[ $outFile == *.sh ]]
78+
then
79+
chmod +x $outFile
80+
fi
8181
done
8282
elif [[ ! "$template" == "" ]]
8383
then

‎test/xpcf_xml_test.cpp‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,15 @@ BOOST_AUTO_TEST_CASE(xml_valid)
4242
fs::path confPath = "xpcf_xml_test_valid.xml";
4343
fs::detail::utf8_codecvt_facet utf8;
4444
org::bcom::xpcf::XPCFErrorCode ret = xpcfComponentManager->load(confPath.generic_string(utf8).c_str());
45+
46+
47+
auto covisibilityGraph = xpcfComponentManager->resolve<IGuitarist>();
48+
4549
BOOST_TEST_REQUIRE(ret == org::bcom::xpcf::_SUCCESS, "Xml parsing failed with error " << ret);
4650
xpcfComponentManager->clear();
4751
}
4852

49-
BOOST_AUTO_TEST_CASE(xml_missing_start_tag)
53+
/*BOOST_AUTO_TEST_CASE(xml_missing_start_tag)
5054
{
5155
SRef<xpcf::IComponentManager> xpcfComponentManager = xpcf::getComponentManagerInstance();
5256
@@ -180,6 +184,6 @@ BOOST_AUTO_TEST_CASE(xml_property_unknown_component)
180184
fs::detail::utf8_codecvt_facet utf8;
181185
BOOST_CHECK_THROW(xpcfComponentManager->load(confPath.generic_string(utf8).c_str()), xpcf::ConfigurationException);
182186
xpcfComponentManager->clear();
183-
}
187+
}*/
184188

185-
BOOST_AUTO_TEST_SUITE_END()
189+
BOOST_AUTO_TEST_SUITE_END()

‎tools/generators/grpc/GRPCProtoGenerator.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,8 @@ void GRPCProtoGenerator::finalizeImpl(std::map<MetadataType,std::string> metadat
361361
fs::remove_all(zipFolderPath);
362362
}
363363

364-
bp::system("wget https://github.com/b-com-software-basis/thirdparties-binaries/releases/download/xpcf_grpc_gen_bin/xpcf_grpc_gen_bin.zip", bp::std_out > out);
364+
//bp::system("wget https://github.com/b-com-software-basis/thirdparties-binaries/releases/download/xpcf_grpc_gen_bin/xpcf_grpc_gen_bin.zip", bp::std_out > out);
365+
bp::system("wget https://github.com/b-com-software-basis/thirdparties-binaries/releases/download/xpcf_grpc_gen_bin_1.71.0/xpcf_grpc_gen_bin.zip", bp::std_out > out);
365366
bp::system("unzip -o ./xpcf_grpc_gen_bin.zip");
366367

367368
fs::path grpcLibs = "./xpcf_grpc_gen_bin/lib/";
@@ -380,7 +381,7 @@ void GRPCProtoGenerator::finalizeImpl(std::map<MetadataType,std::string> metadat
380381
isRemakenGrpc = true;
381382

382383
std::vector<fs::path> envPath = boost::this_process::path();
383-
remakenGrpcRoot /= "grpc/1.50.1";
384+
remakenGrpcRoot /= "grpc/1.71.1";
384385
fs::path grpcBin = remakenGrpcRoot;
385386
grpcBin /= "/bin/x86_64/shared/release/";
386387
protocBin = grpcBin;

0 commit comments

Comments
 (0)