fix sos 2 typo
Merge branch 'master' of github.com:OSGeo/Cat-Interop
refactor build and resolver