Govt to announce comprehensive National Solar Policy on Aug 1