Windoze build sync
authorVolker Birk <vb@pep.foundation>
Fri, 27 Dec 2019 23:42:57 +0100
branchsync
changeset 429291bd76bcb978
parent 4290 9ef77432a291
child 4293 327480b07e3d
Windoze build
build-windows/generate_code.cmd
build-windows/libpEpasn1/libpEpasn1.vcxproj
build-windows/libpEpasn1/libpEpasn1.vcxproj.filters
src/message_api.c
     1.1 --- a/build-windows/generate_code.cmd	Sun Dec 22 19:55:59 2019 +0100
     1.2 +++ b/build-windows/generate_code.cmd	Fri Dec 27 23:42:57 2019 +0100
     1.3 @@ -1,11 +1,13 @@
     1.4  pushd .
     1.5 -cd %1\sync
     1.6 +set pwd=%cd%
     1.7 +cd %pwd%\sync
     1.8  
     1.9  if not exist generated mkdir generated
    1.10  
    1.11  py "%YML_PATH%\yml2proc" -E utf-8 -y gen_actions.ysl2 sync.fsm
    1.12  py "%YML_PATH%\yml2proc" -E utf-8 -y gen_statemachine.ysl2 sync.fsm
    1.13  py "%YML_PATH%\yml2proc" -E utf-8 -y gen_codec.ysl2 sync.fsm
    1.14 +py "%YML_PATH%\yml2proc" -E utf-8 -y gen_codec.ysl2 distribution.fsm
    1.15  py "%YML_PATH%\yml2proc" -E utf-8 -y gen_messages.ysl2 sync.fsm
    1.16  py "%YML_PATH%\yml2proc" -E utf-8 -y gen_message_func.ysl2 sync.fsm
    1.17  
    1.18 @@ -13,16 +15,17 @@
    1.19  xcopy /y generated\*.c ..\src\
    1.20  xcopy /y generated\*.h ..\src\
    1.21  
    1.22 -cd %1\asn.1
    1.23 +cd %pwd%\asn.1
    1.24  
    1.25 -del *.h*
    1.26 -del *.c*
    1.27 +del *.h
    1.28 +del *.c
    1.29  
    1.30  ..\..\Tools\asn1c\bin\asn1c -S ../../Tools/asn1c/share/asn1c -gen-PER -fincludes-quoted -fcompound-names -pdu=auto pEp.asn1 keysync.asn1 sync.asn1
    1.31 +..\..\Tools\asn1c\bin\asn1c -S ../../Tools/asn1c/share/asn1c -gen-PER -fincludes-quoted -fcompound-names -pdu=auto pEp.asn1 keyreset.asn1 distribution.asn1
    1.32  
    1.33  del *-sample.c
    1.34  
    1.35 -cd %1\..
    1.36 +cd %pwd%\..
    1.37  if not exist pEp mklink /d pEp pEpEngine\src
    1.38  
    1.39  popd
     2.1 --- a/build-windows/libpEpasn1/libpEpasn1.vcxproj	Sun Dec 22 19:55:59 2019 +0100
     2.2 +++ b/build-windows/libpEpasn1/libpEpasn1.vcxproj	Fri Dec 27 23:42:57 2019 +0100
     2.3 @@ -61,7 +61,7 @@
     2.4        <SubSystem>Windows</SubSystem>
     2.5      </Link>
     2.6      <PreBuildEvent>
     2.7 -      <Command>"$(ProjectDir)..\generate_code.cmd" "$(ProjectDir)..\.."</Command>
     2.8 +      <Command>cd "$(ProjectDir)..\.." &amp;&amp; "$(ProjectDir)..\generate_code.cmd"</Command>
     2.9        <Message>Generating Code for pEp Sync</Message>
    2.10      </PreBuildEvent>
    2.11    </ItemDefinitionGroup>
    2.12 @@ -95,6 +95,9 @@
    2.13    <ItemGroup>
    2.14      <ClCompile Include="..\..\asn.1\*.c" />
    2.15    </ItemGroup>
    2.16 +  <ItemGroup>
    2.17 +    <None Include="..\generate_code.cmd" />
    2.18 +  </ItemGroup>
    2.19    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    2.20    <ImportGroup Label="ExtensionTargets" />
    2.21  </Project>
    2.22 \ No newline at end of file
     3.1 --- a/build-windows/libpEpasn1/libpEpasn1.vcxproj.filters	Sun Dec 22 19:55:59 2019 +0100
     3.2 +++ b/build-windows/libpEpasn1/libpEpasn1.vcxproj.filters	Fri Dec 27 23:42:57 2019 +0100
     3.3 @@ -516,6 +516,186 @@
     3.4      <ClInclude Include="..\..\asn.1\*.h">
     3.5        <Filter>Header Files</Filter>
     3.6      </ClInclude>
     3.7 +    <ClInclude Include="..\..\asn.1\*.h">
     3.8 +      <Filter>Header Files</Filter>
     3.9 +    </ClInclude>
    3.10 +    <ClInclude Include="..\..\asn.1\*.h">
    3.11 +      <Filter>Header Files</Filter>
    3.12 +    </ClInclude>
    3.13 +    <ClInclude Include="..\..\asn.1\*.h">
    3.14 +      <Filter>Header Files</Filter>
    3.15 +    </ClInclude>
    3.16 +    <ClInclude Include="..\..\asn.1\*.h">
    3.17 +      <Filter>Header Files</Filter>
    3.18 +    </ClInclude>
    3.19 +    <ClInclude Include="..\..\asn.1\*.h">
    3.20 +      <Filter>Header Files</Filter>
    3.21 +    </ClInclude>
    3.22 +    <ClInclude Include="..\..\asn.1\*.h">
    3.23 +      <Filter>Header Files</Filter>
    3.24 +    </ClInclude>
    3.25 +    <ClInclude Include="..\..\asn.1\*.h">
    3.26 +      <Filter>Header Files</Filter>
    3.27 +    </ClInclude>
    3.28 +    <ClInclude Include="..\..\asn.1\*.h">
    3.29 +      <Filter>Header Files</Filter>
    3.30 +    </ClInclude>
    3.31 +    <ClInclude Include="..\..\asn.1\*.h">
    3.32 +      <Filter>Header Files</Filter>
    3.33 +    </ClInclude>
    3.34 +    <ClInclude Include="..\..\asn.1\*.h">
    3.35 +      <Filter>Header Files</Filter>
    3.36 +    </ClInclude>
    3.37 +    <ClInclude Include="..\..\asn.1\*.h">
    3.38 +      <Filter>Header Files</Filter>
    3.39 +    </ClInclude>
    3.40 +    <ClInclude Include="..\..\asn.1\*.h">
    3.41 +      <Filter>Header Files</Filter>
    3.42 +    </ClInclude>
    3.43 +    <ClInclude Include="..\..\asn.1\*.h">
    3.44 +      <Filter>Header Files</Filter>
    3.45 +    </ClInclude>
    3.46 +    <ClInclude Include="..\..\asn.1\*.h">
    3.47 +      <Filter>Header Files</Filter>
    3.48 +    </ClInclude>
    3.49 +    <ClInclude Include="..\..\asn.1\*.h">
    3.50 +      <Filter>Header Files</Filter>
    3.51 +    </ClInclude>
    3.52 +    <ClInclude Include="..\..\asn.1\*.h">
    3.53 +      <Filter>Header Files</Filter>
    3.54 +    </ClInclude>
    3.55 +    <ClInclude Include="..\..\asn.1\*.h">
    3.56 +      <Filter>Header Files</Filter>
    3.57 +    </ClInclude>
    3.58 +    <ClInclude Include="..\..\asn.1\*.h">
    3.59 +      <Filter>Header Files</Filter>
    3.60 +    </ClInclude>
    3.61 +    <ClInclude Include="..\..\asn.1\*.h">
    3.62 +      <Filter>Header Files</Filter>
    3.63 +    </ClInclude>
    3.64 +    <ClInclude Include="..\..\asn.1\*.h">
    3.65 +      <Filter>Header Files</Filter>
    3.66 +    </ClInclude>
    3.67 +    <ClInclude Include="..\..\asn.1\*.h">
    3.68 +      <Filter>Header Files</Filter>
    3.69 +    </ClInclude>
    3.70 +    <ClInclude Include="..\..\asn.1\*.h">
    3.71 +      <Filter>Header Files</Filter>
    3.72 +    </ClInclude>
    3.73 +    <ClInclude Include="..\..\asn.1\*.h">
    3.74 +      <Filter>Header Files</Filter>
    3.75 +    </ClInclude>
    3.76 +    <ClInclude Include="..\..\asn.1\*.h">
    3.77 +      <Filter>Header Files</Filter>
    3.78 +    </ClInclude>
    3.79 +    <ClInclude Include="..\..\asn.1\*.h">
    3.80 +      <Filter>Header Files</Filter>
    3.81 +    </ClInclude>
    3.82 +    <ClInclude Include="..\..\asn.1\*.h">
    3.83 +      <Filter>Header Files</Filter>
    3.84 +    </ClInclude>
    3.85 +    <ClInclude Include="..\..\asn.1\*.h">
    3.86 +      <Filter>Header Files</Filter>
    3.87 +    </ClInclude>
    3.88 +    <ClInclude Include="..\..\asn.1\*.h">
    3.89 +      <Filter>Header Files</Filter>
    3.90 +    </ClInclude>
    3.91 +    <ClInclude Include="..\..\asn.1\*.h">
    3.92 +      <Filter>Header Files</Filter>
    3.93 +    </ClInclude>
    3.94 +    <ClInclude Include="..\..\asn.1\*.h">
    3.95 +      <Filter>Header Files</Filter>
    3.96 +    </ClInclude>
    3.97 +    <ClInclude Include="..\..\asn.1\*.h">
    3.98 +      <Filter>Header Files</Filter>
    3.99 +    </ClInclude>
   3.100 +    <ClInclude Include="..\..\asn.1\*.h">
   3.101 +      <Filter>Header Files</Filter>
   3.102 +    </ClInclude>
   3.103 +    <ClInclude Include="..\..\asn.1\*.h">
   3.104 +      <Filter>Header Files</Filter>
   3.105 +    </ClInclude>
   3.106 +    <ClInclude Include="..\..\asn.1\*.h">
   3.107 +      <Filter>Header Files</Filter>
   3.108 +    </ClInclude>
   3.109 +    <ClInclude Include="..\..\asn.1\*.h">
   3.110 +      <Filter>Header Files</Filter>
   3.111 +    </ClInclude>
   3.112 +    <ClInclude Include="..\..\asn.1\*.h">
   3.113 +      <Filter>Header Files</Filter>
   3.114 +    </ClInclude>
   3.115 +    <ClInclude Include="..\..\asn.1\*.h">
   3.116 +      <Filter>Header Files</Filter>
   3.117 +    </ClInclude>
   3.118 +    <ClInclude Include="..\..\asn.1\*.h">
   3.119 +      <Filter>Header Files</Filter>
   3.120 +    </ClInclude>
   3.121 +    <ClInclude Include="..\..\asn.1\*.h">
   3.122 +      <Filter>Header Files</Filter>
   3.123 +    </ClInclude>
   3.124 +    <ClInclude Include="..\..\asn.1\*.h">
   3.125 +      <Filter>Header Files</Filter>
   3.126 +    </ClInclude>
   3.127 +    <ClInclude Include="..\..\asn.1\*.h">
   3.128 +      <Filter>Header Files</Filter>
   3.129 +    </ClInclude>
   3.130 +    <ClInclude Include="..\..\asn.1\*.h">
   3.131 +      <Filter>Header Files</Filter>
   3.132 +    </ClInclude>
   3.133 +    <ClInclude Include="..\..\asn.1\*.h">
   3.134 +      <Filter>Header Files</Filter>
   3.135 +    </ClInclude>
   3.136 +    <ClInclude Include="..\..\asn.1\*.h">
   3.137 +      <Filter>Header Files</Filter>
   3.138 +    </ClInclude>
   3.139 +    <ClInclude Include="..\..\asn.1\*.h">
   3.140 +      <Filter>Header Files</Filter>
   3.141 +    </ClInclude>
   3.142 +    <ClInclude Include="..\..\asn.1\*.h">
   3.143 +      <Filter>Header Files</Filter>
   3.144 +    </ClInclude>
   3.145 +    <ClInclude Include="..\..\asn.1\*.h">
   3.146 +      <Filter>Header Files</Filter>
   3.147 +    </ClInclude>
   3.148 +    <ClInclude Include="..\..\asn.1\*.h">
   3.149 +      <Filter>Header Files</Filter>
   3.150 +    </ClInclude>
   3.151 +    <ClInclude Include="..\..\asn.1\*.h">
   3.152 +      <Filter>Header Files</Filter>
   3.153 +    </ClInclude>
   3.154 +    <ClInclude Include="..\..\asn.1\*.h">
   3.155 +      <Filter>Header Files</Filter>
   3.156 +    </ClInclude>
   3.157 +    <ClInclude Include="..\..\asn.1\*.h">
   3.158 +      <Filter>Header Files</Filter>
   3.159 +    </ClInclude>
   3.160 +    <ClInclude Include="..\..\asn.1\*.h">
   3.161 +      <Filter>Header Files</Filter>
   3.162 +    </ClInclude>
   3.163 +    <ClInclude Include="..\..\asn.1\*.h">
   3.164 +      <Filter>Header Files</Filter>
   3.165 +    </ClInclude>
   3.166 +    <ClInclude Include="..\..\asn.1\*.h">
   3.167 +      <Filter>Header Files</Filter>
   3.168 +    </ClInclude>
   3.169 +    <ClInclude Include="..\..\asn.1\*.h">
   3.170 +      <Filter>Header Files</Filter>
   3.171 +    </ClInclude>
   3.172 +    <ClInclude Include="..\..\asn.1\*.h">
   3.173 +      <Filter>Header Files</Filter>
   3.174 +    </ClInclude>
   3.175 +    <ClInclude Include="..\..\asn.1\*.h">
   3.176 +      <Filter>Header Files</Filter>
   3.177 +    </ClInclude>
   3.178 +    <ClInclude Include="..\..\asn.1\*.h">
   3.179 +      <Filter>Header Files</Filter>
   3.180 +    </ClInclude>
   3.181 +    <ClInclude Include="..\..\asn.1\*.h">
   3.182 +      <Filter>Header Files</Filter>
   3.183 +    </ClInclude>
   3.184 +    <ClInclude Include="..\..\asn.1\*.h">
   3.185 +      <Filter>Header Files</Filter>
   3.186 +    </ClInclude>
   3.187    </ItemGroup>
   3.188    <ItemGroup>
   3.189      <ClCompile Include="..\..\asn.1\*.c">
   3.190 @@ -989,5 +1169,179 @@
   3.191      <ClCompile Include="..\..\asn.1\*.c">
   3.192        <Filter>Source Files</Filter>
   3.193      </ClCompile>
   3.194 +    <ClCompile Include="..\..\asn.1\*.c">
   3.195 +      <Filter>Source Files</Filter>
   3.196 +    </ClCompile>
   3.197 +    <ClCompile Include="..\..\asn.1\*.c">
   3.198 +      <Filter>Source Files</Filter>
   3.199 +    </ClCompile>
   3.200 +    <ClCompile Include="..\..\asn.1\*.c">
   3.201 +      <Filter>Source Files</Filter>
   3.202 +    </ClCompile>
   3.203 +    <ClCompile Include="..\..\asn.1\*.c">
   3.204 +      <Filter>Source Files</Filter>
   3.205 +    </ClCompile>
   3.206 +    <ClCompile Include="..\..\asn.1\*.c">
   3.207 +      <Filter>Source Files</Filter>
   3.208 +    </ClCompile>
   3.209 +    <ClCompile Include="..\..\asn.1\*.c">
   3.210 +      <Filter>Source Files</Filter>
   3.211 +    </ClCompile>
   3.212 +    <ClCompile Include="..\..\asn.1\*.c">
   3.213 +      <Filter>Source Files</Filter>
   3.214 +    </ClCompile>
   3.215 +    <ClCompile Include="..\..\asn.1\*.c">
   3.216 +      <Filter>Source Files</Filter>
   3.217 +    </ClCompile>
   3.218 +    <ClCompile Include="..\..\asn.1\*.c">
   3.219 +      <Filter>Source Files</Filter>
   3.220 +    </ClCompile>
   3.221 +    <ClCompile Include="..\..\asn.1\*.c">
   3.222 +      <Filter>Source Files</Filter>
   3.223 +    </ClCompile>
   3.224 +    <ClCompile Include="..\..\asn.1\*.c">
   3.225 +      <Filter>Source Files</Filter>
   3.226 +    </ClCompile>
   3.227 +    <ClCompile Include="..\..\asn.1\*.c">
   3.228 +      <Filter>Source Files</Filter>
   3.229 +    </ClCompile>
   3.230 +    <ClCompile Include="..\..\asn.1\*.c">
   3.231 +      <Filter>Source Files</Filter>
   3.232 +    </ClCompile>
   3.233 +    <ClCompile Include="..\..\asn.1\*.c">
   3.234 +      <Filter>Source Files</Filter>
   3.235 +    </ClCompile>
   3.236 +    <ClCompile Include="..\..\asn.1\*.c">
   3.237 +      <Filter>Source Files</Filter>
   3.238 +    </ClCompile>
   3.239 +    <ClCompile Include="..\..\asn.1\*.c">
   3.240 +      <Filter>Source Files</Filter>
   3.241 +    </ClCompile>
   3.242 +    <ClCompile Include="..\..\asn.1\*.c">
   3.243 +      <Filter>Source Files</Filter>
   3.244 +    </ClCompile>
   3.245 +    <ClCompile Include="..\..\asn.1\*.c">
   3.246 +      <Filter>Source Files</Filter>
   3.247 +    </ClCompile>
   3.248 +    <ClCompile Include="..\..\asn.1\*.c">
   3.249 +      <Filter>Source Files</Filter>
   3.250 +    </ClCompile>
   3.251 +    <ClCompile Include="..\..\asn.1\*.c">
   3.252 +      <Filter>Source Files</Filter>
   3.253 +    </ClCompile>
   3.254 +    <ClCompile Include="..\..\asn.1\*.c">
   3.255 +      <Filter>Source Files</Filter>
   3.256 +    </ClCompile>
   3.257 +    <ClCompile Include="..\..\asn.1\*.c">
   3.258 +      <Filter>Source Files</Filter>
   3.259 +    </ClCompile>
   3.260 +    <ClCompile Include="..\..\asn.1\*.c">
   3.261 +      <Filter>Source Files</Filter>
   3.262 +    </ClCompile>
   3.263 +    <ClCompile Include="..\..\asn.1\*.c">
   3.264 +      <Filter>Source Files</Filter>
   3.265 +    </ClCompile>
   3.266 +    <ClCompile Include="..\..\asn.1\*.c">
   3.267 +      <Filter>Source Files</Filter>
   3.268 +    </ClCompile>
   3.269 +    <ClCompile Include="..\..\asn.1\*.c">
   3.270 +      <Filter>Source Files</Filter>
   3.271 +    </ClCompile>
   3.272 +    <ClCompile Include="..\..\asn.1\*.c">
   3.273 +      <Filter>Source Files</Filter>
   3.274 +    </ClCompile>
   3.275 +    <ClCompile Include="..\..\asn.1\*.c">
   3.276 +      <Filter>Source Files</Filter>
   3.277 +    </ClCompile>
   3.278 +    <ClCompile Include="..\..\asn.1\*.c">
   3.279 +      <Filter>Source Files</Filter>
   3.280 +    </ClCompile>
   3.281 +    <ClCompile Include="..\..\asn.1\*.c">
   3.282 +      <Filter>Source Files</Filter>
   3.283 +    </ClCompile>
   3.284 +    <ClCompile Include="..\..\asn.1\*.c">
   3.285 +      <Filter>Source Files</Filter>
   3.286 +    </ClCompile>
   3.287 +    <ClCompile Include="..\..\asn.1\*.c">
   3.288 +      <Filter>Source Files</Filter>
   3.289 +    </ClCompile>
   3.290 +    <ClCompile Include="..\..\asn.1\*.c">
   3.291 +      <Filter>Source Files</Filter>
   3.292 +    </ClCompile>
   3.293 +    <ClCompile Include="..\..\asn.1\*.c">
   3.294 +      <Filter>Source Files</Filter>
   3.295 +    </ClCompile>
   3.296 +    <ClCompile Include="..\..\asn.1\*.c">
   3.297 +      <Filter>Source Files</Filter>
   3.298 +    </ClCompile>
   3.299 +    <ClCompile Include="..\..\asn.1\*.c">
   3.300 +      <Filter>Source Files</Filter>
   3.301 +    </ClCompile>
   3.302 +    <ClCompile Include="..\..\asn.1\*.c">
   3.303 +      <Filter>Source Files</Filter>
   3.304 +    </ClCompile>
   3.305 +    <ClCompile Include="..\..\asn.1\*.c">
   3.306 +      <Filter>Source Files</Filter>
   3.307 +    </ClCompile>
   3.308 +    <ClCompile Include="..\..\asn.1\*.c">
   3.309 +      <Filter>Source Files</Filter>
   3.310 +    </ClCompile>
   3.311 +    <ClCompile Include="..\..\asn.1\*.c">
   3.312 +      <Filter>Source Files</Filter>
   3.313 +    </ClCompile>
   3.314 +    <ClCompile Include="..\..\asn.1\*.c">
   3.315 +      <Filter>Source Files</Filter>
   3.316 +    </ClCompile>
   3.317 +    <ClCompile Include="..\..\asn.1\*.c">
   3.318 +      <Filter>Source Files</Filter>
   3.319 +    </ClCompile>
   3.320 +    <ClCompile Include="..\..\asn.1\*.c">
   3.321 +      <Filter>Source Files</Filter>
   3.322 +    </ClCompile>
   3.323 +    <ClCompile Include="..\..\asn.1\*.c">
   3.324 +      <Filter>Source Files</Filter>
   3.325 +    </ClCompile>
   3.326 +    <ClCompile Include="..\..\asn.1\*.c">
   3.327 +      <Filter>Source Files</Filter>
   3.328 +    </ClCompile>
   3.329 +    <ClCompile Include="..\..\asn.1\*.c">
   3.330 +      <Filter>Source Files</Filter>
   3.331 +    </ClCompile>
   3.332 +    <ClCompile Include="..\..\asn.1\*.c">
   3.333 +      <Filter>Source Files</Filter>
   3.334 +    </ClCompile>
   3.335 +    <ClCompile Include="..\..\asn.1\*.c">
   3.336 +      <Filter>Source Files</Filter>
   3.337 +    </ClCompile>
   3.338 +    <ClCompile Include="..\..\asn.1\*.c">
   3.339 +      <Filter>Source Files</Filter>
   3.340 +    </ClCompile>
   3.341 +    <ClCompile Include="..\..\asn.1\*.c">
   3.342 +      <Filter>Source Files</Filter>
   3.343 +    </ClCompile>
   3.344 +    <ClCompile Include="..\..\asn.1\*.c">
   3.345 +      <Filter>Source Files</Filter>
   3.346 +    </ClCompile>
   3.347 +    <ClCompile Include="..\..\asn.1\*.c">
   3.348 +      <Filter>Source Files</Filter>
   3.349 +    </ClCompile>
   3.350 +    <ClCompile Include="..\..\asn.1\*.c">
   3.351 +      <Filter>Source Files</Filter>
   3.352 +    </ClCompile>
   3.353 +    <ClCompile Include="..\..\asn.1\*.c">
   3.354 +      <Filter>Source Files</Filter>
   3.355 +    </ClCompile>
   3.356 +    <ClCompile Include="..\..\asn.1\*.c">
   3.357 +      <Filter>Source Files</Filter>
   3.358 +    </ClCompile>
   3.359 +    <ClCompile Include="..\..\asn.1\*.c">
   3.360 +      <Filter>Source Files</Filter>
   3.361 +    </ClCompile>
   3.362 +    <ClCompile Include="..\..\asn.1\*.c">
   3.363 +      <Filter>Source Files</Filter>
   3.364 +    </ClCompile>
   3.365 +  </ItemGroup>
   3.366 +  <ItemGroup>
   3.367 +    <None Include="..\generate_code.cmd" />
   3.368    </ItemGroup>
   3.369  </Project>
   3.370 \ No newline at end of file
     4.1 --- a/src/message_api.c	Sun Dec 22 19:55:59 2019 +0100
     4.2 +++ b/src/message_api.c	Fri Dec 27 23:42:57 2019 +0100
     4.3 @@ -1420,7 +1420,7 @@
     4.4  // }
     4.5  
     4.6  static bool compare_first_n_bytes(const char* first, const char* second, size_t n) {
     4.7 -    int i;
     4.8 +    size_t i;
     4.9      for (i = 0; i < n; i++) {
    4.10          char num1 = *first;
    4.11          char num2 = *second;